5077 Commits

Author	SHA1	Message	Date
Mathieu Parent	12ea1cc01e	git_pillar: Add tests for mountpoint parameter ... (cherry picked from commit 6e2f4e471d08fcc29ce144af6dcd605b85644522)	2018-11-16 06:07:24 +01:00
Mathieu Parent	fce467e438	git_pillar: Add tests for root parameter ... (cherry picked from commit 2e88b74816)	2018-11-16 06:07:24 +01:00
Ch3LL	178dab3a4b	Merge branch 2017.7 into 2018.3 ... Conflicts: - doc/topics/tutorials/salt_bootstrap.rst - tests/integration/cloud/clouds/test_digitalocean.py	2018-11-14 10:33:44 -05:00
Mike Place	c1dde7e9b1	Merge pull request #50328 from rallytime/fix-48734 ... Fix issue with salt-run jobs.list_jobs where Target: unknown-target	2018-11-13 12:49:57 -07:00
Nicole Thomas	c00fd43ee9	Merge pull request #50493 from rallytime/bp-50362 ... Back-port #50362 to 2017.7	2018-11-13 11:59:50 -05:00
twangboy	60559cfa8a	Remove flaky test	2018-11-13 09:25:47 -05:00
twangboy	a696a8f564	Fix test_matcher on Windows ... Fixes a timeout issue in test_salt_documentation_arguments_not_assumed	2018-11-13 09:25:41 -05:00
Nicole Thomas	917781dc95	Lint: Add blank line	2018-11-12 17:47:46 -05:00
rallytime	1517bb31a8	Update old utils paths to use new paths	2018-11-12 16:13:35 -05:00
rallytime	d8e7c47a05	Merge branch '2017.7' into '2018.3' ... Conflicts: - tests/support/case.py	2018-11-12 16:11:17 -05:00
Ch3LL	3583519da4	Update digital ocean location for cloud tests	2018-11-12 15:52:32 -05:00
Nicole Thomas	b16ff9cd1c	Merge pull request #50469 from dwoz/minion_timeout_test ... Fix up integration.minion.test_timeout	2018-11-12 11:53:45 -05:00
Daniel A. Wozniak	794ba17c94	Reset date and time after changing	2018-11-12 00:43:22 -07:00
Daniel A. Wozniak	686153a77c	Fix up integration.minion.test_timeout ... This test wasn't able to be run on it's own. Fix it and add more debugging	2018-11-11 21:30:08 -07:00
rallytime	2c51cf9816	Make target test job more specific to reduce test flakiness	2018-11-08 10:27:41 -05:00
rallytime	caace3f184	Rewrite job cache target test to be more robust	2018-11-07 17:01:06 -05:00
Pablo Suárez Hernández	71af32d31a	Remove unicode references	2018-11-07 16:55:55 +00:00
Pablo Suárez Hernández	b7af5e52c5	Test git ext_pillar across multiple repos using __env__	2018-11-07 16:33:03 +00:00
rallytime	e993692d01	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/master.py - salt/transport/tcp.py - salt/transport/zeromq.py - tests/integration/cli/test_batch.py	2018-11-05 12:54:30 -05:00
Daniel A. Wozniak	18b5d43d09	Increase cli batch test timeout for increased reliablity	2018-11-02 17:15:31 -07:00
Gareth J. Greenaway	8885d1ff3d	Merge branch '2018.3' into 41342_beacon_state_module_fixes	2018-11-02 12:08:19 -07:00
lomeroe	0e011ad805	add runTest method to class for PY2	2018-11-02 08:03:43 -05:00
lomeroe	377ec095ab	add a test for #47784	2018-11-02 08:03:43 -05:00
lomeroe	0a14505e21	change backslashes in comment string to fix lint error	2018-11-02 08:03:43 -05:00
lomeroe	02181d385a	add fix/test for #50079 ... ADML display names that have a single match in each Computer/User policy would not work with the "short" display name, requiring either the "long" name or the explicit policy name	2018-11-02 08:03:43 -05:00
lomeroe	05f29511a4	more lint fixes	2018-11-02 08:03:43 -05:00
lomeroe	94b33350a8	lint fixes in test	2018-11-02 08:03:43 -05:00
lomeroe	2a79626538	update test to actually work ... update lgpo module to catch another possible case of multiple ADML names	2018-11-02 08:03:43 -05:00
lomeroe	42840ecd9b	add missing comma in function call	2018-11-02 08:03:43 -05:00
lomeroe	c283f50074	Log a warning message instead of an exception when a SID cannot be ... converted to a username (for user rights assignments) Add a module test file	2018-11-02 08:03:43 -05:00
Brett Benassi	346a8317b1	Updating the AMI's and sizes for the test run.	2018-11-01 19:05:49 -06:00
Gareth J. Greenaway	c2354a9cb1	Fixing beacon state test. Adding a reset function to beacon module to clear out beacon configuration. Useful for tests runs to ensure bits are left over between runs.	2018-11-01 16:47:02 -07:00
Gareth J. Greenaway	2390f471ce	Adding SaltReturnAssertsMixin back in	2018-11-01 15:22:18 -07:00
Gareth J. Greenaway	677d0908fd	Remove zookeeper reference.	2018-11-01 15:05:42 -07:00
Gareth J. Greenaway	f3dee43bf0	Updating the beacon state module to ensure that the format of the beacon data that is being sent along to the beacon execution module is in the right format.	2018-11-01 15:02:21 -07:00
rallytime	b29fcfabbb	New test must be py3 compatible...oops. :)	2018-10-31 12:52:58 -04:00
rallytime	6859e0e6e2	Add regression test for issue #48734	2018-10-31 12:03:14 -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
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	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
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