107 Commits

Author	SHA1	Message	Date
Ch3LL	ffa2f5fa50	Merge branch '2018.3' into '2019.2' ... Conflicts: - pkg/windows/build_env_2.ps1 - pkg/windows/build_env_3.ps1 - pkg/windows/req.txt - pkg/windows/req_win.txt - salt/grains/core.py	2019-02-15 15:09:36 -05:00
Gareth J. Greenaway	0760133336	adding integration.scheduler.test_helpers to various files to by pass the test_module_name_source_match check.	2019-02-13 09:27:55 -08:00
Erik Johnson	c312b57712	Remove no-longer-existant test module from whitelist.txt ... This was converted to unit tests in #50528. Since there are no unit tests in the whitelist.txt, I've removed it rather than renaming.	2018-11-21 08:35:18 -06:00
rallytime	82e73fe49d	Merge branch '2018.3' into 'fluorine' ... Conflicts: - doc/ref/tops/all/index.rst - salt/fileclient.py - salt/grains/core.py - salt/modules/win_file.py - salt/pillar/__init__.py - salt/utils/http.py	2018-10-18 10:41:42 -04:00
Daniel A. Wozniak	9997f45626	Merge branch '2018.3' into shelltests	2018-10-05 11:15:23 -07:00
Daniel A. Wozniak	df5e27156e	Add spm tests for windows	2018-10-04 15:43:50 -07:00
Daniel A. Wozniak	0e4fbc5b50	Add syndic tests to whitelist.txt for Windows	2018-10-03 18:43:43 -07:00
Daniel A. Wozniak	4141cc82e9	Add spm tests to whitelist.txt for Windows	2018-10-03 18:43:43 -07:00
Daniel A. Wozniak	02ad722e02	Add more shell integration tests to whitelist	2018-10-03 18:43:43 -07:00
Daniel Wozniak	48275c0072	Add shell.test_key to whitelist and fix wart	2018-10-03 18:43:43 -07:00
Daniel Wozniak	e5edff4154	Skip tests not valid on windows	2018-10-03 18:43:42 -07:00
Daniel Wozniak	a3897290e8	Add shell cp tests and fix them	2018-10-03 18:43:42 -07:00
rallytime	7e0db5cb15	Merge branch '2018.3' into 'fluorine' ... Conflicts: - salt/cloud/clouds/azurearm.py	2018-09-25 15:18:00 -04:00
Daniel A Wozniak	7c7353c5f6	Add more tests to whitelist	2018-09-19 11:21:10 -06:00
rallytime	17d0a878fa	Merge branch '2018.3' into 'fluorine' ... Conflicts: - tests/whitelist.txt	2018-09-18 10:11:34 -04:00
rallytime	bd5ec82921	Merge branch '2018.3' into 'fluorine' ... Conflicts: - salt/runners/nacl.py - salt/tops/varstack_top.py - tests/unit/states/test_linux_acl.py	2018-09-12 12:47:09 -04:00
Daniel Wozniak	f908cde7f7	Merge branch '2018.3' into add_whitelist	2018-09-12 10:04:00 -06:00
Daniel A Wozniak	51500ac701	Adding passing windows nacl runner tests to whitelist	2018-09-11 16:43:00 -06:00
Daniel A. Wozniak	2959da0f99	Add some runners test files to whitelist	2018-09-11 08:38:16 -07:00
Daniel A. Wozniak	5770b05612	Fix hitelist file order	2018-09-10 10:05:43 -07:00
Daniel A Wozniak	ccbcb5588a	Add more tests to whitelist for Windows	2018-09-10 09:34:27 -07:00
rallytime	49afc328b5	Merge branch '2018.3' into 'fluorine' ... Conflicts: - .github/CODEOWNERS	2018-09-07 16:21:13 -04:00
Nicole Thomas	1a41b473ce	Merge pull request #49543 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-09-07 14:19:31 -04:00
rallytime	cf508a4a50	Merge branch '2017.7' into '2018.3' ... Conflicts: - requirements/opt.txt - requirements/tests.txt - salt/modules/win_service.py - tests/integration/states/test_service.py	2018-09-06 12:08:01 -04:00
Daniel A. Wozniak	6a4f8239d7	Fix merge wart	2018-09-05 23:34:45 -07:00
rallytime	0c8b412556	Merge branch '2018.3' into 'fluorine' ... Conflicts: - tests/integration/modules/test_archive.py	2018-09-04 12:05:48 -04:00
rallytime	4d4922863b	Merge branch '2018.3' into 'fluorine' ... Conflicts: - salt/runners/cache.py - tests/support/case.py - tests/whitelist.txt	2018-08-30 14:39:48 -04:00
rallytime	f7226f400f	Merge branch '2017.7' into '2018.3' ... Conflicts: - pkg/osx/build_env.sh - salt/modules/win_useradd.py - salt/utils/yamldumper.py - tests/integration/modules/test_archive.py - tests/integration/output/test_output.py	2018-08-30 14:23:23 -04:00
Nicole Thomas	cf3d2878f2	Merge branch '2017.7' into fix_win_service	2018-08-30 08:58:32 -04:00
Daniel A. Wozniak	2b08cf1516	Account for more tests that are not in 2017.7 ... I also made sure there are no other missing tests since this bit me once already.	2018-08-28 14:35:09 -07:00
Daniel A. Wozniak	f9d7dbdb26	The autoruns module has not been renamed	2018-08-28 14:22:05 -07:00
Daniel A. Wozniak	56ea4eebcd	Account for more tests that are not in 2017.7 ... I also made sure there are no other missing tests since this bit me once already.	2018-08-28 12:13:52 -07:00
twangboy	38009660e4	Add tests	2018-08-28 11:03:33 -06:00
rallytime	ac406c49a7	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/ext/win_inet_pton.py - salt/pillar/git_pillar.py - tests/integration/cli/test_batch.py - tests/integration/modules/test_archive.py - tests/integration/modules/test_pkg.py - tests/integration/states/test_file.py - tests/support/case.py - tests/whitelist.txt	2018-08-28 11:22:47 -04:00
Daniel A. Wozniak	aeb0fa3bfd	custom_grains tests do not exist	2018-08-27 21:30:01 -07:00
Daniel A. Wozniak	b9c344b7ce	Fix module.archive tests for win py3	2018-08-27 00:44:41 -07:00
Daniel A. Wozniak	1765d53367	Fix archive tests on Windows platform	2018-08-27 00:44:39 -07:00
Daniel A. Wozniak	06f271ff19	Add archive module tests to whitelist.txt	2018-08-27 00:44:39 -07:00
Daniel A. Wozniak	9cb8fe28c5	Add more tests to whitelist for windows	2018-08-27 00:44:38 -07:00
Daniel A. Wozniak	bc971e419e	add doc tests	2018-08-27 00:44:38 -07:00
Daniel A. Wozniak	8899a5ee1a	Add more client tests to whitelist	2018-08-27 00:44:37 -07:00
Daniel A. Wozniak	14cd7b4830	Add cli tests to whitelist	2018-08-27 00:44:37 -07:00
Daniel A. Wozniak	230ad851fd	Fix module.archive tests for win py3	2018-08-27 00:41:30 -07:00
Daniel A. Wozniak	1f37571547	Fix archive tests on Windows platform	2018-08-26 19:17:46 -07:00
Daniel A. Wozniak	ea4c2ea4a5	Add archive module tests to whitelist.txt	2018-08-26 18:45:06 -07:00
Daniel A. Wozniak	fad032e713	Add more tests to whitelist for windows	2018-08-26 03:25:45 -07:00
Daniel A. Wozniak	fd05d30cd8	add doc tests	2018-08-26 01:00:07 -07:00
Daniel A. Wozniak	f2387ae4b9	Add more client tests to whitelist	2018-08-26 00:45:18 -07:00
Daniel A. Wozniak	7135abe80f	Add cli tests to whitelist	2018-08-26 00:31:28 -07:00
Daniel A. Wozniak	7cdf1ef121	Fix typo	2018-08-22 13:32:07 -07:00