11 Commits

Author	SHA1	Message	Date
twangboy	669aaee10d	Mock file exists properly	2017-07-11 17:09:21 -06:00
twangboy	a4231c9827	Fix ret mock for linux	2017-07-11 16:59:42 -06:00
twangboy	0c484f8979	Fix unit tests on Windows	2017-07-11 16:55:43 -06:00
rallytime	ef0df4a954	Merge branch '2016.11' into 'nitrogen' ... Conflicts: - salt/modules/win_network.py - salt/modules/win_pkg.py - salt/utils/gitfs.py - tests/unit/modules/test_win_network.py - tests/unit/states/test_file.py	2017-05-09 14:32:49 -06:00
Pedro Algarvio	abe608d739	Drop @patch usage	2017-04-28 13:36:42 +01:00
Pedro Algarvio	f8d7530a58	Proper mocking.	2017-04-01 14:22:59 +01: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	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