21 Commits

Author	SHA1	Message	Date
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
twangboy	1641851175	Fix the name of the _cmd_quote test	2018-08-28 11:16:29 -06:00
twangboy	97567af232	Skip tests on Linux systems	2018-08-28 11:03:34 -06: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	1c1727e8fd	Fix broken service stop test	2018-08-26 18:34:47 -07:00
rallytime	4122da40b5	Merge branch '2017.7' into '2018.3' ... Conflicts: - tests/integration/netapi/rest_tornado/test_app.py - tests/integration/states/test_service.py	2018-07-24 14:28:33 -04:00
Nicole Thomas	801eae3b8d	Merge pull request #48672 from frogunder/45012 ... add service enabled test	2018-07-23 11:38:48 -04:00
Frode Gundersen	0747f2e58a	add service enabled test	2018-07-19 16:47:56 +00: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
Erik Johnson	93ee5ee2b0	Fix all Sphinx warnings ... Well, all but one, which we expect to see	2018-05-31 15:28:25 -05:00
Gareth J. Greenaway	b3c1be27fb	Tier two unicode updates for modules, states and related tests.	2018-01-25 11:59:25 -08:00
rallytime	a38ceab7cf	Merge branch '2017.7' into 'develop' ... Conflicts: - salt/cli/batch.py - salt/master.py - salt/utils/path.py - tests/unit/modules/test_state.py	2017-09-29 11:48:33 -04:00
twangboy	058e50e530	Fix unit.modules.test_win_service ... Mock `cmd.run`	2017-09-27 16:37:12 -06:00
Jay	6566f10085	Update test_win_service.py	2017-07-03 19:03:48 -04:00
Cléry Plassat	a7974fe508	Patched the windows status test	2017-06-16 12:48:15 +02:00
Pedro Algarvio	99bc71dc4e	Proper mocking.	2017-03-28 19:04:01 +01:00
Pedro Algarvio	9b1e55aa85	Import the full module namespace to avoid import shadowing. ... https://github.com/saltstack/salt/pull/39996#issuecomment-287857698	2017-03-28 19:02:47 +01:00
Pedro Algarvio	40a64191a1	Absolute imports and A LOT of code cleanup.	2017-03-01 01:33:07 +00:00
Pedro Algarvio	3beb3fb801	Move whatever we need from salttesting to salt. ... Let's drop the salttesting dependency cycle.	2017-02-28 22:52:49 +00:00
Pedro Algarvio	15af4c9728	Test filenames conformity. Adjust for pytest.	2017-02-23 23:19:42 +00:00