10 Commits

Author	SHA1	Message	Date
Erik Johnson	d942752e95	Fix usage of assert_called_once in Python 3 < 3.6 ... This is a more complete fix which builds upon 41c65b0 and covers all refs to assert_called_once in the suite.	2017-07-03 09:30:12 -05:00
Dmitry Kuzmenko	127e48025a	Py3: tests_disk fix: don't expect dict iteration order will be the same	2017-06-21 14:48:59 +03:00
Pedro Algarvio	abe608d739	Drop @patch usage	2017-04-28 13:36:42 +01:00
rallytime	f552dd63f3	Merge branch '2016.11' into 'nitrogen' ... Conflicts: - pkg/windows/installer/Salt-Minion-Setup.nsi - tests/unit/states/test_tomcat.py	2017-04-14 10:46:56 -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