Erik Johnson
|
c69f17dd18
|
Add integration test for #42774
|
2017-08-08 14:20:42 -05:00 |
|
rallytime
|
de85b49b90
|
Merge branch '2016.11' into 'nitrogen'
Conflicts:
- salt/config/__init__.py
- salt/modules/cp.py
- salt/states/saltmod.py
- salt/utils/__init__.py
- salt/utils/gzip_util.py
- tests/integration/shell/test_cp.py
|
2017-05-26 11:11:54 -06:00 |
|
rallytime
|
9ff2694155
|
Merge branch '2016.11' into 'nitrogen'
Conflicts:
- pkg/salt-minion.service
- salt/modules/junos.py
- salt/modules/localemod.py
- salt/modules/win_system.py
- salt/states/junos.py
- tests/unit/modules/test_localemod.py
- tests/unit/modules/test_win_powercfg.py
- tests/unit/states/dockerng_test.py
|
2017-05-24 16:32:59 -06:00 |
|
rallytime
|
c91bb18298
|
Merge branch '2016.11' into 'nitrogen'
Conflicts:
- doc/ref/configuration/master.rst
- salt/modules/pip.py
- salt/states/saltmod.py
|
2017-05-04 11:49:33 -06:00 |
|
Pedro Algarvio
|
2ee6d5d589
|
Import from the original modules not tests.integration
|
2017-04-04 18:58:19 +01:00 |
|
Pedro Algarvio
|
785698d2ce
|
Import for the original module
|
2017-04-04 18:04:38 +01:00 |
|
Pedro Algarvio
|
8031ac0209
|
Move mixins to tests.support.mixins.
The adapted config mixin get config methods are not static methods
|
2017-04-04 17:29:34 +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 |
|