5376 Commits

Author	SHA1	Message	Date
Nicole Thomas	c29f9d23a5	Merge pull request #50342 from Ch3LL/fix_unless_onlif_mac ... Fix test_issue_30161_unless_and_onlyif_together for MacOSX	2018-11-05 09:22:21 -05:00
twangboy	6948274c25	Add some timeouts	2018-11-02 17:11:50 -06:00
Ch3LL	4002a7c317	Fix test_issue_30161_unless_and_onlyif_together for MacOSX	2018-11-01 14:31:22 -04:00
twangboy	5fe46d22f9	Un-fix path seperators for Windows	2018-10-30 16:04:29 -06:00
Nicole Thomas	f652633241	Merge pull request #50312 from rallytime/merge-fluorine ... [fluorine] Merge forward from 2018.3 to fluorine	2018-10-30 13:45:29 -04:00
Nicole Thomas	3f4a4bccc9	Merge pull request #50256 from garethgreenaway/porting_50216_to_fluorine ... [fluorine] Porting #50216 to fluorine	2018-10-30 12:28:49 -04:00
rallytime	77b4379a99	Merge branch '2018.3' into 'fluorine' ... Conflicts: - salt/modules/aptpkg.py - tests/integration/cloud/clouds/test_ec2.py	2018-10-30 12:23:39 -04:00
rallytime	381a59d56e	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/states/pip_state.py - tests/integration/cloud/clouds/test_ec2.py	2018-10-30 11:41:18 -04:00
rallytime	f23852207f	Fix matcher grain file ... This was inadvertently changed in th filename_map backport. This commit restores the matcher grain file to match all branches previous to the inadvertent change.	2018-10-30 09:51:51 -04:00
Daniel Wallace	9746b894f1	mark ansiblegate test as flaky	2018-10-29 19:40:58 -05:00
Brett Benassi	80982ada82	Removing an un needed change and maybe fixing the lint error	2018-10-29 15:30:51 -06:00
rallytime	d6af1bb8d7	Remove the test_custom_grains integration file ... This file has been renamed for the filename_map functionality.	2018-10-29 16:02:35 -04:00
Nicole Thomas	10ba8b42a8	Merge pull request #50276 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-10-29 15:05:14 -04:00
rallytime	3f2712fbc1	Merge branch '2018.3' into 'fluorine' ... Conflicts: - tests/unit/states/test_virt.py - tests/unit/test_config.py	2018-10-29 12:36:28 -04:00
Nicole Thomas	f7c2f04574	Merge pull request #50182 from terminalmage/issue50050 ... Backport runtests.py modifications from develop to 2018.3	2018-10-29 12:25:06 -04:00
rallytime	f05abb09de	Merge branch '2017.7' into '2018.3'	2018-10-29 11:22:36 -04:00
Nicole Thomas	4fdcf7c4a7	Lint: Add extra blank line	2018-10-29 11:17:12 -04:00
Brett Benassi	cebfd8ad03	Fixing lint error	2018-10-29 09:08:48 -06:00
rallytime	113d76e045	Revert "Move jinja templating tests alongside salt/utils/jinja.py's tests" ... This reverts commit 6d9c2eb6b0.	2018-10-29 11:05:33 -04:00
Brett Benassi	2df611565a	Adding subnetID so it knows the right VPC to build the node in.	2018-10-29 08:57:22 -06:00
rallytime	a0cfbdcb79	Merge branch '2017.7' into '2018.3' ... No conflicts.	2018-10-29 09:55:06 -04:00
Brett Benassi	6a1e9f0a7f	Adding securitygroupname as the config instead of securitygroup	2018-10-26 15:38:48 -06:00
Gareth J. Greenaway	8935e3c58b	Porting #50216 to fluorine.	2018-10-26 12:03:51 -07:00
rallytime	c55dcf02eb	Add init file back in for integration/cloud/clouds pkg ... This was accdientally removed during some cloud test file renaming, which prevents the test from running due to an ImportError	2018-10-26 14:32:03 -04:00
Nicole Thomas	303f991f6a	Merge pull request #50225 from rallytime/merge-fluorine ... [fluorine] Merge forward from 2018.3 to fluorine	2018-10-26 09:32:36 -04:00
twangboy	c974db4e49	Revert some indenting	2018-10-25 17:18:57 -06:00
twangboy	593677ca82	Use the dedent helper function instead	2018-10-25 17:17:09 -06:00
twangboy	4cb7062fd7	Fix integration.states.test_file on Windows ... Fix hard-coded, unix-style line endings	2018-10-25 16:50:24 -06:00
rallytime	8fed338708	Merge branch '2018.3' into 'fluorine' ... Conflicts: - salt/spm/pkgfiles/local.py - salt/utils/schedule.py - tests/integration/scheduler/test_eval.py	2018-10-25 10:31:06 -04:00
Gareth J. Greenaway	685509fae3	Fixing an issue when a combination of the when parameter as a list plus using the splay parameter would cause the schedule to continuously run jobs in an endless loop, regardless of if their scheduled time had been receached. Also fixing a related issue where scheduled jobs that rely on _next_fire_time were not being run as the corrected splayed time but rather running at the original scheduled time. Adding new tests.	2018-10-24 17:22:37 -07:00
Daniel Wozniak	43303fb6cd	Merge pull request #50190 from dwoz/grains_template_test ... Fix test_managed_file_with_grains_data on Windows	2018-10-24 15:43:35 -07:00
Nicole Thomas	462314b286	Merge pull request #50187 from garethgreenaway/port_49871_to_2018_3 ... [2018.3] Adding fixes to scheduler tests to 2018.3	2018-10-24 15:45:31 -04:00
Nicole Thomas	8ad9a1bd61	Merge pull request #50201 from Ch3LL/_2018.3.3 ... [2018.3] Ensure that tokens are hex to avoid hanging/errors in cherrypy	2018-10-24 15:44:23 -04:00
Nicole Thomas	017d39400a	Merge pull request #50202 from Ch3LL/_2017.7.8 ... [2017.7] Ensure that tokens are hex to avoid hanging/errors in cherrypy	2018-10-24 15:42:11 -04:00
Gareth J. Greenaway	d232dfb9b7	Update test_eval.py	2018-10-24 09:37:23 -07:00
Daniel A. Wozniak	b77db48d77	Fix test_managed_file_with_grains_data on Windows	2018-10-23 22:58:09 -07:00
Gareth J. Greenaway	d8d8559b75	Fixing lint	2018-10-23 19:09:02 -07:00
Gareth J. Greenaway	d2d0622a6d	Back porting #49871 to 2018.3. Adding some additional changes to ensure they are passing on OS X.	2018-10-23 15:58:59 -07:00
Erik Johnson	f2e55128bb	Evan Moar Lint	2018-10-23 14:48:32 -05:00
Erik Johnson	39c245525f	Lint	2018-10-23 14:48:31 -05:00
Erik Johnson	662ca0de73	Rename files to match naming convention	2018-10-23 14:47:17 -05:00
Erik Johnson	186d333c92	Add back changes lost in cherry-pick	2018-10-23 14:46:05 -05:00
Erik Johnson	eaa4da3d49	Rename providers to clouds to respect naming convention ... Also, move rackspace openstack-based tests to test_openstack.py	2018-10-23 14:46:05 -05:00
Erik Johnson	85b96de009	Rename some files to avoid them being identified as test modules	2018-10-23 14:41:06 -05:00
Erik Johnson	6d9c2eb6b0	Move jinja templating tests alongside salt/utils/jinja.py's tests	2018-10-23 14:28:45 -05:00
Erik Johnson	c5593bc843	Rename custom_grains.py so it's not identified as a test module	2018-10-23 14:22:07 -05:00
Daniel Wallace	209a1d0fa7	remove extra imports	2018-10-23 11:28:54 -05:00
Mike Place	ce6e5ed6d4	Merge pull request #50170 from rallytime/bp-win_runas-fix ... Skip the win_runas util test on non-windows	2018-10-23 08:37:48 -06:00
rallytime	1040f507cc	Lint fix: add skipIf import and remove unused import	2018-10-23 09:54:02 -04:00
rallytime	a46f9c3dcd	Skip the win_runas util test on non-windows	2018-10-23 09:20:41 -04:00