Nevins Bartolomeo
|
b3a4d016c9
|
Mock cmd.run_stdout not cmd.run
|
2017-04-06 16:48:10 -04:00 |
|
rallytime
|
52edbffc85
|
Merge branch '2016.11' into 'develop'
Conflicts:
- doc/ref/cache/all/index.rst
- doc/topics/cache/index.rst
- salt/cache/localfs.py
- salt/modules/boto_rds.py
- salt/roster/cloud.py
- salt/states/virtualenv_mod.py
- tests/integration/states/test_archive.py
- tests/unit/modules/test_dockermod.py
- tests/unit/states/dockerng_test.py
|
2017-03-28 17:09:30 -06: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 |
|