14041 Commits

Author	SHA1	Message	Date
Anthony Shaw	529687a855	update test assertions	2018-11-01 08:41:53 +11:00
Anthony Shaw	ba526ad149	remove unused import	2018-10-30 14:38:22 -04:00
Anthony Shaw	220e57f848	create 2 simple unit tests for the netyang state module and fix issue in #47425	2018-10-30 14:38:22 -04:00
Anthony Shaw	20bf3067b9	reproduce bug in 47425	2018-10-30 14:38:22 -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
Brett Benassi	80982ada82	Removing an un needed change and maybe fixing the lint error	2018-10-29 15:30:51 -06:00
Daniel Wallace	fb43061cb1	fix test	2018-10-29 14:45:23 -05:00
Daniel Wallace	5eb0e37f4e	add extra space to localemod test	2018-10-29 14:31:36 -05: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
Nicole Thomas	0f1dc08d41	Merge pull request #50282 from twangboy/fix_test_diskusage ... Fix `unit.beacons.test_diskusage` on Windows	2018-10-29 14:37:12 -04:00
twangboy	fd369dd115	Mock is_windows = False	2018-10-29 10:25:56 -06: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	8968f9d164	Revert "Rename test_map_conf test file to respect naming convention" ... This reverts commit 8326a09921.	2018-10-29 10:46:29 -04:00
rallytime	85a9395c2a	Remove saltclass pillar unit test for list expansion ... This test only applies to functionality present in Fluorine or newer. This commit will need to be reverted again in the fluorine branch.	2018-10-29 10:34:24 -04:00
rallytime	3d95673be0	Use get_config_dir() instead of self.config_dir ... This attribute does not exist in the 2018.3 branch. Use the function for now, and then change this back on the merge-forward.	2018-10-29 10:23:00 -04:00
rallytime	e8b3a62b31	Add init file back in for unit/client pkg ... This file was accidentally removed during some test renaming. The absence of this file prevents the test from running due to an ImportError.	2018-10-29 10:19:52 -04: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
Cédric Bosdonnat	d527dd29cc	Rename states/test_libvirt.py into states/test_virt.py ... Modules test files are named after the module itself, the state virt module needs to comply with that rule too.	2018-10-26 16:05:03 -04:00
rallytime	ab4a670ff2	Remove pgjsonb returner unit tests ... The tests that are written in this file are for functions not present in the 2018.3 branch. This commit will need to be reverted in the merge-forward to `fluorine`.	2018-10-26 15:58:46 -04:00
rallytime	68ab3eef55	Remove "test_custom" from grains section of filename_map ... This test is for functionality only available in fluorine and newer. Removing this for 2018.3.	2018-10-26 15:17:12 -04:00
rallytime	68146983cb	Remove test_error from scheduler tests ... These tests are not present on 2018.3	2018-10-26 14:54:25 -04: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
rallytime	dfa05b978e	Remove test files for beacons that don't exist in 2018.3	2018-10-25 11:16:11 -04:00
Nicole Thomas	9ad43f2b71	Merge pull request #50063 from twangboy/fix_50039 ... Use long when setting REG_QWORD	2018-10-25 09:45:02 -04:00
Nicole Thomas	01b083e20b	Merge pull request #50188 from garethgreenaway/49965_beacon_diskusage_windows ... [2018.3] fixes to diskusage beacon	2018-10-25 09:41:18 -04:00
Nicole Thomas	9ea51c00bd	Merge pull request #50214 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-10-25 09:38:39 -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
rallytime	897145c4a1	Merge branch '2017.7' into '2018.3' ... No conflicts.	2018-10-24 15:54:15 -04: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
twangboy	84b8dd6856	Add tests	2018-10-24 11:49:01 -06:00
Daniel A. Wozniak	7f613ac020	Do not fail if process already ended ... We can expect the subprocess has already ended by the time we're checking for child processes. Handle this case gracefully so that tests do not fail with an exception.	2018-10-24 10:17:59 -07: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	42b3203cf9	Fixing lint	2018-10-23 19:14:00 -07:00
Gareth J. Greenaway	d8d8559b75	Fixing lint	2018-10-23 19:09:02 -07:00
Gareth J. Greenaway	f65fa57a10	Fixing a bug in the diskusage beacon that prevented it from working on Windows. Adding a couple tests to test functionality on Windows.	2018-10-23 19:03:19 -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	85612cfc8f	runtests.py: Fix IndexError in --from-filenames	2018-10-23 14:53:20 -05:00
Daniel A. Wozniak	25097f9933	Make sure from-filenames intersect with names-file ... When both names-file an from-names are defined we want to make sure the tests that from-filenames returns intersect with the test in the names file.	2018-10-23 14:53:01 -05:00
Erik Johnson	ed864ceb28	runtests.py: Accept modified file list from a text file	2018-10-23 14:52:39 -05:00