10 Commits

Author	SHA1	Message	Date
Erik Johnson	26d2f4a52a	Do not automatically unmask services to start/restart/etc. them	2017-05-01 16:01:35 -05:00
rallytime	2cd0c5e4ec	Merge branch '2016.11' into 'nitrogen' ... Conflicts: - doc/topics/cloud/azurearm.rst - salt/cloud/clouds/vultrpy.py - salt/modules/aptpkg.py - salt/modules/dockermod.py - tests/unit/modules/dockerng_test.py - tests/unit/modules/test_pillar.py	2017-04-10 14:09:25 -06:00
Pedro Algarvio	9a11538b54	Stop using deprecated TestCase methods	2017-04-01 14:22:57 +01:00
Pedro Algarvio	d397763553	Adjust to the new LoaderModuleMockMixin usage	2017-03-28 19:03:59 +01:00
Pedro Algarvio	5c13f7b2bb	Proper mocking.	2017-03-28 19:02:50 +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
Erik Johnson	28564da966	Implement no_block for service.running/service.dead (systemd only)	2017-02-24 15:14:09 -06:00
Pedro Algarvio	15af4c9728	Test filenames conformity. Adjust for pytest.	2017-02-23 23:19:42 +00:00