5120 Commits

Author	SHA1	Message	Date
Daniel A. Wozniak	d794edb515	fix linter	2019-02-12 12:02:55 -07:00
Daniel A. Wozniak	d6720d2d14	Wait for minions to be pingable before starting tests	2019-02-12 12:02:48 -07:00
Gareth J. Greenaway	e891b3f515	Merge branch '2018.3.4' into merge-2018.3.4 ... Conflicts: tests/integration/states/test_file.py tests/unit/states/test_file.py tests/unit/utils/test_dns.py	2019-02-11 10:46:53 -08:00
twangboy	7771632adc	Fix ssh on Windows	2019-02-07 10:07:01 -07:00
twangboy	33922c93c6	Fix the failing dns test on Windows ... Gets the name of the first interface on the system. Windows network interfaces don't have the same name across Window systems. YOu can even go as far as naming them whatever you want. The test was failing because the interface name was hard-coded as 'Ethernet'.	2019-02-01 13:52:39 -07:00
Erik Johnson	a35c023fdc	Don't use a decorator that assumes /etc/apt/sources.list.d exists ... This will make the test fail on most platforms	2019-01-31 19:47:11 -06:00
Erik Johnson	6a62e7912a	Add integration test for architecture support	2019-01-31 16:12:51 -06:00
Erik Johnson	191235d8d3	Remove custom grains module from 2018.3 branch ... Support for passing the grains data to custom grains modules wasn't added until the 2019.2 release cycle. It seems like this file was included when something else was backported to 2018.3.	2019-01-31 09:10:45 -06:00
Erik Johnson	3cec85e725	Normalize results if test proxy is enabled	2019-01-29 12:58:24 -06:00
Pedro Algarvio	f4e169255b	Fix test	2019-01-28 20:37:05 +00:00
Daniel Wozniak	43a9d2f972	Merge pull request #51338 from Ch3LL/bp-51207 ... Backport #51207 into 2018.3.4	2019-01-27 16:44:58 -07:00
Daniel A. Wozniak	e74a6c61de	Fix py3 managed.file test failure	2019-01-25 14:42:50 -05:00
Daniel A. Wozniak	824950c4cd	Fix 50221 regression test on Windows	2019-01-25 14:42:38 -05:00
Daniel A. Wozniak	1840af9c00	peserve newlines from pillar data for file.managed	2019-01-25 14:42:32 -05:00
twangboy	345ae676b6	Backport PR# 50771 to 2018.3 branch	2019-01-25 14:38:30 -05:00
Pedro Algarvio	ff6824c682	Don't fail the test because of order	2019-01-25 13:00:03 +00:00
Pedro Algarvio	d4ab6d815b	Merge branch '2018.3' into fix_test_pkg	2019-01-24 11:39:57 +00:00
Daniel A. Wozniak	a5255f0eb2	Merge remote-tracking branch 'saltstack/2018.3' into issue-50221	2019-01-23 08:26:20 -07:00
Daniel A. Wozniak	c1ea10f090	Fix py3 managed.file test failure	2019-01-22 10:46:32 -07:00
Daniel A. Wozniak	ac978f0647	Fix 50221 regression test on Windows	2019-01-19 18:21:27 -07:00
Daniel A. Wozniak	65f38b5ab2	peserve newlines from pillar data for file.managed	2019-01-19 16:11:49 -07:00
Gareth J. Greenaway	a233dbc79a	Ensuring we can handle a string that contains single quote + an escaped double quote.	2019-01-18 12:45:09 -08:00
twangboy	b91b2c62f5	Backport PR# 50771 to 2018.3 branch	2019-01-16 15:54:17 -07:00
Pedro Algarvio	b348ace640	Make sure blackout tests clean up after themselves. Properly. ... (cherry picked from commit 9ab0e98e2c)	2019-01-15 16:31:35 +00:00
Pedro Algarvio	68a12d50d0	These should not be considered destructive tests ... (cherry picked from commit 479439ab99)	2019-01-15 16:31:35 +00:00
Jeremy McMillan	71c357414d	Revert "backport test improvements from develop" ... This reverts commit 0af7653dfa3fc9b30601dec2c8ac2ce3cba52e7f. I guess that was way too optimistic.	2019-01-15 16:31:35 +00:00
Jeremy McMillan	e32d219599	backport test improvements from develop ... Bogus random test failures forklifted from develop at 414bfe61a4	2019-01-15 16:31:35 +00:00
Gareth J. Greenaway	45f363b152	Fixing various lint errors.	2018-12-20 16:19:01 -08:00
Gareth J. Greenaway	bcf8f06aa4	fixing lint	2018-12-18 16:48:14 -08:00
Gareth J. Greenaway	543ec7bc79	Ensure source_hash returned from get_source_sum is lowercase.	2018-12-18 16:51:26 -07:00
Mike Place	9f8289be9c	Merge pull request #50692 from terminalmage/update-tests ... Update a couple test modules to use with_tempdir/with_tempfile decorators	2018-12-10 10:24:02 -07:00
Mathieu Parent	e9714126ac	git_pillar: Add support for all_saltenvs parameter ... On the road to #32245.	2018-12-05 20:56:29 +01:00
Mathieu Parent	5423c27f84	git_pillar: Allow root and mountpoint parameters together ... Fixes: #50364	2018-12-05 05:20:04 +01:00
Erik Johnson	be14517c5c	Make x509 tests use tempfiles instead of hard-coding them ... This keeps us from needing to manually clean them up in the tearDown	2018-12-03 13:13:14 -06:00
Erik Johnson	a394cd76f6	Update file integration tests to use decorator for tempdirs	2018-11-29 09:29:23 -06:00
Gareth J. Greenaway	2f6dac917b	Updating test_maxrunning_master to Mock get_running_jobs.	2018-11-23 17:07:16 -08:00
Gareth J. Greenaway	44940d6c23	Ensure minion tests using minion options.	2018-11-23 17:07:16 -08:00
Gareth J. Greenaway	722be433c2	Fixing lint	2018-11-23 17:07:16 -08:00
Gareth J. Greenaway	65b44214d4	Adding some master specific functions to uitls/masters.py to determine if a Salt process is running. Updating utils/schedule.py to use the appropriate running function either from utils/master.py or utils/minion.py depending on where the scheduled job is running. Adding tests to test maxrunning in scheduled jobs for both the minion and master.	2018-11-23 17:07:16 -08:00
Daniel Wozniak	60b4622570	Merge pull request #50366 from jdsieci/2018.3-fix-issue50254 ... 2018.3 fix issue50254	2018-11-20 13:31:29 -07:00
Gareth J. Greenaway	4c85119a57	merge-forward 2017.7 to 2018.3	2018-11-19 10:39:38 -08:00
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
Brett Benassi	009e52d4b9	Adding tag to ec2 cloud tests	2018-11-15 15:36:05 -07: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