Commit Graph

16 Commits

Author SHA1 Message Date
rallytime
a35cf9ca1e
Add unicode_literals to modules, states, tests (H) 2018-01-23 09:55:46 -05:00
rallytime
291515e445 [PY3] Fix haproxyconn unit tests that are failing
``assertItemsEqual`` does not exist in Python 3. It was removed. Since
``assertItemsEqual(a, b)`` is the same thing as asserting that
``sorted(a) == sorted(b)``, we can just update the test in this manner
to work in both Python 2 and 3.
2017-07-03 16:25:57 -06:00
rallytime
68c277e5f7 Fix haproxyconn unit test failures
Too many arguments were being passed into the test function

This change removes the extra "mock" arg and the tests pass.

This issue was introduced in PR #40713

Fixes https://github.com/saltstack/salt-jenkins/issues/357
2017-05-24 10:41:38 -06:00
Mike Place
b43b89c5fa Merge pull request #40713 from pgstenberg/feature-haproxyconnaddfunc
Additional functionality to the haproxy module
2017-05-22 12:11:32 -05:00
Pedro Algarvio
abe608d739
Drop @patch usage 2017-04-28 13:36:42 +01:00
Per-Gustaf Stenberg
a0d6f9d883 Fixed lint errors in haproxy module and unit-tests 2017-04-17 19:13:17 +02:00
Per-Gustaf Stenberg
bcd88b0fb2 Added wait_state function in haproxy module 2017-04-17 19:13:17 +02:00
Per-Gustaf Stenberg
0120e32cfb added list_backends and get_backend function in haproxy module 2017-04-17 19:13:17 +02:00
Per-Gustaf Stenberg
438092126b Added list_frontends in haproxy module with returned mock data 2017-04-17 19:13:17 +02:00
Per-Gustaf Stenberg
14b492b5b4 Fixed unit test comments for haproxy module 2017-04-17 19:13:17 +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