Christian McHugh
249987f750
merge with develop
2017-11-27 22:04:59 +00:00
Nicole Thomas
9e45e4eff9
Lint: Remove extra blank lines
2017-11-27 11:25:05 -05:00
Christian McHugh
590834a136
Use json format with newer pip versions (> 9)
...
Add unit tests for both pip > 9 and legacy
2017-11-23 22:27:23 +00:00
Christian McHugh
ab5520fdf7
add true and false test for is_installed
2017-11-23 14:08:46 +00:00
rallytime
26410c662f
Update some salt.utils.x paths for moved util functions
...
Through merge forwards, some of the old-style paths have made their
way into develop. This PR corrects some of these instances on the more
popular functions.
2017-08-29 16:24:47 -04:00
rallytime
1f0b90aa57
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/cloud/clouds/joyent.py
- salt/engines/slack.py
2017-07-26 17:51:36 -06:00
twangboy
4ee24202fc
Fix unit tests for test_pip
2017-07-05 15:49:53 -06:00
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
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
