9 Commits

Author	SHA1	Message	Date
rallytime	c4fd2a0930	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/modules/rabbitmq.py - tests/integration/modules/test_pip.py	2018-06-30 09:33:21 -04:00
twangboy	77629f640a	Fix module unit tests	2018-06-29 11:15:23 -06:00
Gareth J. Greenaway	b3c1be27fb	Tier two unicode updates for modules, states and related tests.	2018-01-25 11:59:25 -08:00
Pedro Algarvio	d397763553	Adjust to the new LoaderModuleMockMixin usage	2017-03-28 19:03:59 +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	1f7a0aa65b	Proper mocking	2017-03-28 19:00:51 +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