9 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
rallytime	16a2747d7d	Merge branch '2016.11' into '2017.7' ... Conflicts: - pkg/windows/buildenv/salt.bat - salt/modules/pillar.py - salt/utils/openstack/nova.py - tests/unit/cloud/clouds/test_dimensiondata.py - tests/unit/cloud/clouds/test_gce.py	2017-06-14 13:31:42 -06:00
Pedro Algarvio	d397763553	Adjust to the new LoaderModuleMockMixin usage	2017-03-28 19:03:59 +01:00
Pedro Algarvio	1f7a0aa65b	Proper mocking	2017-03-28 19:00:51 +01:00
Pedro Algarvio	0b41b92d7d	Use salt.utils.versions instead of distutils.version	2017-03-08 19:22:33 +00:00
Pedro Algarvio	d13b40554b	Use the __version__ variable from tests.support.mock	2017-03-06 14:35:12 +00: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