Erik Johnson
3881b6e0f3
Prepare git_pillar test code for adding HTTP tests
...
This further abstracts some of the setup and teardown code so it can be
used for git-over-http tests.
It also moves the code that was originally added to the archive
state integration tests to create a local http server into
salt.support.helpers so that it can be more easily and portably used.
2017-04-24 11:00:39 -05:00
Erik Johnson
7cef07b0d9
Remove legacy git_pillar tests
...
Also remove git_pillar configuration from the test suite's master
configuration file.
2017-04-20 03:51:08 -05:00
Pedro Algarvio
61003bca0a
Take care of resource leakage on tests
2017-04-04 18:58:20 +01: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
rallytime
2222e1cae9
Merge branch '2016.11' into 'develop'
...
Conflicts:
- salt/modules/napalm_network.py
- tests/integration/states/test_archive.py
- tests/integration/states/test_file.py
- tests/unit/modules/test_docker.py
2017-03-21 10:19:52 -06:00
Erik Johnson
66596c6d75
Fail test if sudo is missing
2017-03-15 17:15:56 -05:00
Nicole Thomas
2f0f7cd224
Merge pull request #39897 from rallytime/merge-develop
...
[develop] Merge forward from 2016.11 to develop
2017-03-09 09:03:46 -07:00
Pedro Algarvio
0b41b92d7d
Use salt.utils.versions instead of distutils.version
2017-03-08 19:22:33 +00:00
Pedro Algarvio
e2e303e724
Minor changes to paths
2017-03-08 18:34:32 +00:00
rallytime
4fc9b5484b
Merge branch '2016.11' into 'develop'
...
Conflicts:
- salt/client/ssh/__init__.py
- salt/pillar/makostack.py
- tests/integration/client/test_runner.py
- tests/integration/states/test_file.py
2017-03-08 09:04:26 -07:00
Pedro Algarvio
e180f1e913
Normalize the mode
2017-03-03 15:15:13 +00:00
Pedro Algarvio
5b5a6ebbe8
Minor code cleanup
2017-03-02 19:58:10 +00:00
Pedro Algarvio
5e3309d5f8
Let's use the skip_if_not_root decorator instead
2017-03-02 19:58:10 +00:00
Pedro Algarvio
2f3d0b0b81
These are not destructive tests
2017-03-02 19:58:10 +00: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
rallytime
b4366103a6
Merge branch '2016.11' into 'develop'
...
Conflicts:
- .pylintrc
- .testing.pylintrc
- salt/fileclient.py
- salt/minion.py
- salt/modules/docker.py
- salt/modules/win_iis.py
- salt/states/docker.py
- salt/states/file.py
- salt/utils/__init__.py
- tests/integration/modules/test_sysmod.py
2017-02-27 15:11:37 -07:00
Pedro Algarvio
15af4c9728
Test filenames conformity. Adjust for pytest.
2017-02-23 23:19:42 +00:00
