9 Commits

Author	SHA1	Message	Date
rallytime	4718d31e53	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/config/__init__.py - salt/minion.py - salt/modules/pip.py - salt/states/pip_state.py - salt/states/virtualenv_mod.py - tests/integration/modules/test_status.py	2018-04-19 17:15:20 -04:00
Daniel Wallace	4c07a3d1e9	fix other tests	2018-04-17 09:23:03 -05:00
rallytime	c08c67f3d4	Add unicode_literals to modules, states, and related tests	2018-01-23 15:26:25 -05:00
Pedro Algarvio	abe608d739	Drop @patch usage	2017-04-28 13:36:42 +01: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