Dmitry Kuzmenko
4a2406f178
Py3: fixed some tests.
...
tls module: convert bytes to string
gzip util: use BytesIO for 'wb' file
django module: ignore arguments order in assert
pillar module: correctly test pillar merge
2017-06-01 16:49:57 +03:00
Pedro Algarvio
abe608d739
Drop @patch usage
2017-04-28 13:36:42 +01:00
rallytime
cd0adb82d6
Spelling fix
2017-04-11 13:35:38 -06:00
rallytime
36f7a6481b
Remove blacklisted loader usage of dunder variables
2017-04-11 12:16:15 -06:00
rallytime
2cd0c5e4ec
Merge branch '2016.11' into 'nitrogen'
...
Conflicts:
- doc/topics/cloud/azurearm.rst
- salt/cloud/clouds/vultrpy.py
- salt/modules/aptpkg.py
- salt/modules/dockermod.py
- tests/unit/modules/dockerng_test.py
- tests/unit/modules/test_pillar.py
2017-04-10 14:09:25 -06:00
Pedro Algarvio
a0245b049f
Proper mocking.
2017-04-01 14:22: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
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
