9 Commits

Author	SHA1	Message	Date
Mathieu Le Marec - Pasquet	fa2f9cf7bd	Make returncode friendly to onfail requisites ... Ensure that correctly handled states execution (via onfail) will return a 0 code if onfail requisites suceed.	2017-03-31 00:22:51 +02:00
Pedro Algarvio	d397763553	Adjust to the new LoaderModuleMockMixin usage	2017-03-28 19:03:59 +01:00
Pedro Algarvio	ea81540cce	Code cleanup. Proper mocking.	2017-03-28 19:00:52 +01:00
Nicole Thomas	2f0f7cd224	Merge pull request #39897 from rallytime/merge-develop ... [develop] Merge forward from 2016.11 to develop	2017-03-09 09:03:46 -07:00
Daniel Wallace	587b7fc7f3	fix test	2017-03-08 18:53:19 -06:00
rallytime	4fc9b5484b	Merge branch '2016.11' into 'develop' ... Conflicts: - salt/client/ssh/__init__.py - salt/pillar/makostack.py - tests/integration/client/test_runner.py - tests/integration/states/test_file.py	2017-03-08 09:04:26 -07: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