8 Commits

Author	SHA1	Message	Date
rallytime	e440d2e8af	Use self.setGrains as context manager in grains test	2017-04-13 13:39:11 -06:00
rallytime	17efc7341c	Merge branch '2016.11' into 'nitrogen' ... Conflicts: - salt/modules/win_wua.py - salt/netapi/rest_cherrypy/app.py - salt/version.py - tests/unit/states/grains_test.py - tests/unit/states/test_archive.py	2017-04-13 10:14:51 -06: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