rallytime
be8d34ec21
Merge branch '2018.3' into 'develop'
...
No conflicts.
2018-06-01 15:19:09 -04:00
rallytime
dc32b67c03
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- salt/modules/win_snmp.py
- tests/integration/modules/test_saltutil.py
- tests/integration/states/test_pkg.py
- tests/support/helpers.py
- tests/support/runtests.py
- tests/unit/fileserver/test_gitfs.py
- tests/whitelist.txt
2018-05-29 11:14:39 -04:00
Ch3LL
019edad8e4
Fix flaky refresh pillar integration test
2018-05-25 15:13:56 -04:00
rallytime
5b50eaf6b0
Merge branch '2018.3' into 'develop'
...
Conflicts:
- doc/ref/proxy/all/salt.proxy.cimc.rst
- doc/ref/proxy/all/salt.proxy.panos.rst
- doc/topics/releases/2018.3.0.rst
- salt/modules/cmdmod.py
- salt/modules/state.py
- salt/utils/schedule.py
- tests/integration/modules/test_state.py
2018-04-05 13:25:46 -04:00
rallytime
893196d3e6
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- doc/conf.py
- salt/loader.py
- salt/modules/dockermod.py
- salt/modules/sensehat.py
- salt/utils/parsers.py
- tests/integration/cloud/providers/test_ec2.py
- tests/integration/modules/test_cp.py
- tests/integration/modules/test_groupadd.py
- tests/integration/spm/test_man_spm.py
- tests/integration/states/test_npm.py
- tests/unit/states/test_environ.py
2018-04-03 14:33:11 -04:00
rallytime
209a8029c3
Fix the new test failures from the mantest changes
...
The changes in #46778 introduced a couple of test failures into the 2017.7 branch.
This PR cleans up some of the references causing failures on 3 new test failures.
The failures are due to the new reference of the `mantest` module, which is only
used for testing here, and not an actual module in salt to test docs and the
saltutil module against.
2018-04-02 16:06:50 -04:00
coutotyler
7d076dc29a
Adding serializer extmod
2018-03-07 18:22:34 -08:00
Erik Johnson
06ec8db7e2
[PY3] Add unicode_literals to more high-priority states/modules
2018-01-22 08:26:28 -06:00
Mircea Ulinic
dce017b3f7
Make tests happy
2017-11-30 15:50:11 +00:00
rallytime
052b13c98e
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/cli/daemons.py
- salt/client/ssh/__init__.py
- salt/modules/win_pkg.py
- salt/netapi/rest_cherrypy/app.py
- salt/proxy/fx2.py
- salt/utils/__init__.py
- salt/utils/jinja.py
- salt/utils/napalm.py
- salt/utils/path.py
- salt/utils/verify.py
- tests/integration/modules/test_saltutil.py
- tests/integration/states/test_service.py
- tests/unit/utils/test_verify.py
2017-11-22 12:36:03 -05:00
Ch3LL
ffa4bddcad
Increase sleep timeout for pillar refresh test
2017-11-13 10:50:16 -05:00
rallytime
f26beffe48
Update old utils paths to new paths
2017-11-05 20:39:40 -07:00
Ch3LL
34e2955445
add saltutil.refresh_pillar test
2017-10-25 15:56:49 -04:00
Daniel Wallace
3a26d5d42d
add cloud to saltutil sync test
2017-04-28 09:12:05 -06:00
Pedro Algarvio
2ee6d5d589
Import from the original modules not tests.integration
2017-04-04 18:58:19 +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
