98731 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
rallytime	274697d0b3	Remove the test_saltclass_list_expasion unit test file ... The tests contained in this file have been moved to the test_saltclass unit test file. This is necessary for filename_map to work correctly.	2018-10-29 15:53:11 -04:00
rallytime	0d23e5aa16	Remove test_pgjsonb_return unit test file ... This file has been renamed for the filename_map functionality.	2018-10-29 15:51:32 -04:00
rallytime	2c6078613b	Remove beacon unit tests that end with *_beacon.py ... These have all been renamed for the filename_map functionality.	2018-10-29 15:49:11 -04:00
rallytime	96a225d501	Revert "Remove saltclass pillar unit test for list expansion" ... This reverts commit 85a9395c2a.	2018-10-29 13:05:09 -04:00
rallytime	086371f567	Revert "Remove pgjsonb returner unit tests" ... This reverts commit ab4a670ff2.	2018-10-29 13:03:40 -04:00
rallytime	4e930a0fed	Revert "Remove "test_custom" from grains section of filename_map" ... This reverts commit 68ab3eef55.	2018-10-29 13:03:27 -04:00
rallytime	fffe689f98	Revert "Remove test_error from scheduler tests" ... This reverts commit 68146983cb.	2018-10-29 13:03:12 -04:00
rallytime	ff9e5f9b25	Revert "Remove test files for beacons that don't exist in 2018.3" ... This reverts commit dfa05b978e.	2018-10-29 12:58:25 -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	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
rallytime	3057ca4b0b	Lint fix: add extra blank line in core.py	2018-10-29 10:46:46 -04: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
Nicole Thomas	1e8b092256	Merge pull request #50267 from m03/fix-aptly-config-paths-20183 ... Fix missing aptly config paths	2018-10-29 09:27:22 -04:00
Mike Place	25a8dbe3e9	Merge pull request #50237 from twangboy/fix_test_cmdmod ... Fix `unit.modules.test_cmdmod` on Windows in Kitchen	2018-10-29 13:56:47 +01:00
m03	319bb31944	Fix missing aptly config paths	2018-10-28 11:32:45 -07: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
twangboy	9a2547b526	Encode os.linesep	2018-10-26 10:00:23 -06: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
Nicole Thomas	2df3d88e6f	Merge pull request #50240 from twangboy/fix_test_file ... Fix `integration.states.test_file` on Windows	2018-10-26 09:27:22 -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
twangboy	314a699519	Ensure proper line ending	2018-10-25 15:31:06 -06:00
rallytime	d8e5e9ea49	Merge branch '2018.3' into 'fluorine' ... No conflicts.	2018-10-25 16:16:10 -04:00
Megan Wilhite	ab0b022fee	Merge pull request #50232 from Ch3LL/search_latest ... Update search engine IDs for releases	2018-10-25 16:15:06 -04:00
Nicole Thomas	1c8cdf985f	Merge pull request #50231 from saltstack/revert-50174-bp-50146 ... Revert "Back-port #50146 to 2018.3"	2018-10-25 16:12:14 -04:00
Ch3LL	3452d9bf01	change order of search engine ids	2018-10-25 16:11:35 -04:00
Ch3LL	c9546dfb08	Update search engine IDs for releases	2018-10-25 16:10:15 -04:00
Nicole Thomas	c76ac1b7b8	Revert "Back-port #50146 to 2018.3"	2018-10-25 15:55:27 -04:00
Daniel Wallace	f485b4afae	enable testing only filemaps	2018-10-25 11:17: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
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
Nicole Thomas	8dd4f43aec	Merge pull request #50172 from rallytime/bp-50140 ... Back-port #50140 to 2018.3	2018-10-25 10:00:31 -04:00
Nicole Thomas	f0cd8478d2	Merge pull request #50021 from twangboy/add_grains ... Add a `windowsdomaintype` grain	2018-10-25 09:45:38 -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
Nicole Thomas	51b3fa4bb6	Merge pull request #50216 from garethgreenaway/50162_when_plus_splay_endless_loop ... [2018.3] Fixes to scheduler, list of whens plus splay	2018-10-25 09:31:25 -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