10 Commits

Author	SHA1	Message	Date
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