88 Commits

Author	SHA1	Message	Date
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
Daniel A Wozniak	7c7353c5f6	Add more tests to whitelist	2018-09-19 11:21:10 -06: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
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	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	95efc516ba	Fix typo	2018-08-17 21:39:22 -07:00
Daniel A. Wozniak	3c49544c19	Account for file renames	2018-08-17 15:06:41 -07:00
rallytime	3e6445a9d6	Merge branch '2017.7' into '2018.3' ... Conflicts: - doc/man/salt-api.1 - doc/man/salt-call.1 - doc/man/salt-cloud.1 - doc/man/salt-cp.1 - doc/man/salt-key.1 - doc/man/salt-master.1 - doc/man/salt-minion.1 - doc/man/salt-proxy.1 - doc/man/salt-run.1 - doc/man/salt-ssh.1 - doc/man/salt-syndic.1 - doc/man/salt-unity.1 - doc/man/salt.1 - doc/man/salt.7 - doc/man/spm.1 - salt/beacons/log.py - salt/client/ssh/__init__.py - salt/modules/cmdmod.py - salt/utils/win_functions.py - tests/integration/modules/test_cmdmod.py - tests/integration/netapi/rest_tornado/test_app.py - tests/integration/runners/test_state.py	2018-08-08 13:31:57 -04:00
Ch3LL	9312a993a5	Add cmd module integration tests for windows and fix space in path issue	2018-08-01 14:05:52 -04:00
rallytime	436510796f	Merge branch '2017.7' into '2018.3' ... No conflicts.	2018-07-27 11:44:07 -04:00
Frode Gundersen	757fde70c6	Merge branch '2017.7' into 45014	2018-07-24 11:07:14 -06:00
Frode Gundersen	a7a914060d	add windows integration tests for states.file	2018-07-24 16:42:07 +00:00
rallytime	e740d3b208	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/client/ssh/state.py - salt/client/ssh/wrapper/state.py - salt/modules/dockermod.py - salt/modules/npm.py - salt/modules/testinframod.py - tests/integration/modules/test_mac_system.py - tests/integration/modules/test_mac_timezone.py - tests/integration/ssh/test_state.py - tests/integration/states/test_user.py - tests/unit/modules/test_npm.py - tests/unit/states/test_file.py	2018-07-23 11:15:43 -04:00
Ch3LL	2bedadfadb	Add windows pkg module integration tests	2018-07-20 12:47:37 -04:00
rallytime	3273bbdab7	Merge branch '2017.7' into '2018.3' ... Conflicts: - doc/ref/configuration/master.rst - doc/ref/modules/all/index.rst - doc/topics/grains/index.rst - doc/topics/releases/2016.3.4.rst - doc/topics/spm/spm_formula.rst - doc/topics/tutorials/cron.rst - doc/topics/tutorials/index.rst - doc/topics/tutorials/stormpath.rst - salt/engines/slack.py - salt/log/handlers/fluent_mod.py - salt/modules/cyg.py - salt/modules/junos.py - salt/modules/namecheap_dns.py - salt/modules/namecheap_domains.py - salt/modules/namecheap_ns.py - salt/modules/namecheap_ssl.py - salt/modules/namecheap_users.py - salt/modules/reg.py - salt/modules/tomcat.py - salt/modules/vault.py - salt/modules/win_file.py - salt/modules/zpool.py - salt/output/highstate.py - salt/renderers/pass.py - salt/runners/cache.py - salt/states/boto_apigateway.py - salt/states/boto_iam.py - salt/states/boto_route53.py - salt/states/msteams.py - salt/states/reg.py - salt/states/win_iis.py - tests/integration/modules/test_cmdmod.py - tests/integration/states/test_user.py - tests/support/helpers.py - tests/unit/cloud/clouds/test_openstack.py - tests/unit/fileserver/test_gitfs.py - tests/unit/modules/test_junos.py - tests/unit/pillar/test_git.py - tests/unit/states/test_win_path.py - tests/unit/test_pillar.py - tests/unit/utils/test_format_call.py - tests/unit/utils/test_utils.py - tests/unit/utils/test_warnings.py	2018-06-01 14:54:12 -04:00
Nicole Thomas	63efb76d51	Merge pull request #47822 from Ch3LL/win_user_test ... Add user state integration tests to windows	2018-05-30 17:13:06 -04:00
rallytime	dc32b67c03	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/modules/win_snmp.py - tests/integration/modules/test_saltutil.py - tests/integration/states/test_pkg.py - tests/support/helpers.py - tests/support/runtests.py - tests/unit/fileserver/test_gitfs.py - tests/whitelist.txt	2018-05-29 11:14:39 -04:00
Nicole Thomas	96b7c0cc76	Merge pull request #47778 from Ch3LL/win_state_pkg ... Add test_pkg integration state tests to windows	2018-05-25 16:36:46 -04:00
Ch3LL	7848114d6a	Add win_dns module integration tests for windows	2018-05-24 14:11:27 -04:00
Ch3LL	788abf771e	Add user state integration tests to windows	2018-05-24 11:46:02 -04:00
Ch3LL	872e162137	Add test_pkg integration state tests to windows	2018-05-22 15:11:14 -04:00
rallytime	25f03ae425	Merge branch '2017.7' into '2018.3' ... Conflicts: - tests/integration/modules/test_status.py - tests/integration/states/test_pip_state.py - tests/support/case.py - tests/whitelist.txt	2018-05-09 11:24:02 -04:00
Daniel A. Wozniak	b3289e5a1c	Fix test file name	2018-05-07 14:40:15 -07:00