10 Commits

Author	SHA1	Message	Date
rallytime	f875ee3309	Merge branch 'nitrogen' into 'develop' ... Conflicts: - tests/integration/runners/test_runner_returns.py	2017-04-28 09:26:26 -06:00
Pedro Algarvio	abe608d739	Drop @patch usage	2017-04-28 13:36:42 +01:00
Mike Place	6da806d1cc	Merge pull request #39850 from epcim/pr_fix_keystone_endpoints_multiregion ... Fix endpoint handling per region	2017-04-23 04:00:00 -06:00
Petr Michalec	ab1dd446e7	Endpoint handling per region, fixes #35874 ... - extend tests for multiple regions - region arg by default set to None - print verbose changes to be exec.	2017-04-21 15:48:52 +02: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