9 Commits

Author	SHA1	Message	Date
rallytime	2617cf851f	Merge branch '2017.7' into 'develop' ... Conflicts: - salt/modules/aptpkg.py - salt/utils/win_functions.py - tests/unit/states/test_mount.py	2017-10-20 10:44:29 -04:00
twangboy	a862e0bf2d	Remove unneeded import	2017-10-19 13:30:16 -06:00
twangboy	d78f27466d	Fix unit.states.test_mount for Windows ... Use `os.path.realpath` to convert paths Mock `os.path.exists`	2017-10-19 13:30:16 -06:00
Gareth J. Greenaway	132b56d785	Updating mount to allow opts in the state file to be removed and have the volume remounted	2017-09-13 10:30:15 -07: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