Commit Graph

13 Commits

Author SHA1 Message Date
garethgreenaway
92bc4fa39b Merge branch 'develop' into missing_minions_branch 2017-08-23 12:56:02 -07:00
Gareth J. Greenaway
eec0646c79 Fixing lint error in test_auth.py 2017-08-16 11:22:16 -07:00
Gareth J. Greenaway
0c0cdd8aa1 Updating the test_auth tests. 2017-08-15 20:24:40 -07:00
Kunal Ajay Bajpai
0d7658c870 Fixed lint failure 2017-08-08 14:21:02 +05:30
Kunal Ajay Bajpai
200f414969 Fixed failing LoadAuth unit test 2017-08-08 13:35:05 +05:30
rallytime
6e857681d4 Add calls to salt.client.get_local_client to patches list in auth unit tests
We need to mock the calls to `salt.client.get_local_client` in the
tests.unit.test_auth.py file. Without these mocks, there are many tests
that fail when the entire set of unit tests runs. (Specifically, these fail
with both the module and state boto_apigateway unit tests run.)

This mocked patch is similar to the change in PR #41082 and fixes all 16 test
failures reported in https://github.com/saltstack/salt-jenkins/issues/326.
2017-05-05 14:26:54 -06:00
Pedro Algarvio
abe608d739
Drop @patch usage 2017-04-28 13:36:42 +01:00
Pedro Algarvio
2ee6d5d589
Import from the original modules not tests.integration 2017-04-04 18:58:19 +01:00
Pedro Algarvio
c6fce40a2a
Use a temporary configuration instead 2017-04-01 18:57:25 +01:00
Dmitry Kuzmenko
37b35a19c7 Bugs and tests fixes. 2017-03-22 16:00:51 +03: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