valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
88,627 Commits 24 Branches 182 Tags 341 MiB
3df091f543
Commit Graph

800 Commits

Author SHA1 Message Date
rallytime
2cb4f2baa9 Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - salt/states/keystone.py
 2017-06-06 12:50:35 -06:00
Ch3LL
8d27bb31b2
Disable home dir check for mac in more test_user tests 2017-06-06 11:20:18 -04:00
Ch3LL
85e77c9cc8
Disable home dir check for mac in test_user 2017-06-06 11:02:19 -04:00
Ch3LL
ddcb1ca9a7
change group to wheel for macosx in tests 2017-06-05 17:16:54 -04:00
rallytime
e848c67682 Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - salt/states/keystone.py
 2017-05-31 14:39:33 -06:00
Mike Place
713a671f09 Merge pull request #41471 from terminalmage/blockreplace-test 
Fix a file.blockreplace test for Python 3
 2017-05-30 13:48:22 -05:00
rallytime
8c1dc36a8b Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - salt/modules/zypper.py
  - salt/utils/parsers.py
 2017-05-30 10:20:44 -06:00
rallytime
675937e0ab Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - tests/unit/states/test_keystone.py
 2017-05-30 10:16:14 -06:00
Erik Johnson
4573a9cad5 Fix a file.blockreplace test for Python 3 
This test uses file.accumulated to accumulate data, to be used in the
file.blockreplace state. However, because this data is stored in a
dictionary, the iteration order is different on different versions of
Python. As it is very clearly stated that the accumulator data structure
is a dictionary, rather than modifying the file.accumulated behavior
this commit just updates the test so that it searches for all values
that it should find between the block markers.
 2017-05-26 15:51:38 -05:00
rallytime
ff417db115 Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - doc/topics/venafi/index.rst
  - pkg/salt-proxy@.service
  - salt/config/__init__.py
 2017-05-26 11:27:24 -06:00
Petr Michalec
6db8915021 Endpoint handling per region, fixes #35874 
- extend tests for multiple regions
- region arg by default set to None
- print verbose changes to be exec.
 2017-05-26 11:15:29 -06: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
Nicole Thomas
824f2d3b69 Merge pull request #41398 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-05-26 09:17:48 -06:00
Nicole Thomas
36bc67e191 Merge pull request #41420 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-05-25 11:16:25 -06:00
Erik Johnson
28a8605dea Skip a test that doesn't apply to Python 3 
This test is checking behavior that seems to have been specific to the
carbon package from PyPI. Since this is a Python 2-only module, and has
deps that do not exist on Python 3, it should not be run on Python 3.
 2017-05-25 09:37:35 -05: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
57166fd892 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-24 15:30:44 -06:00
Benjamin Drung
33a7f8b2ec Fix typos 
lintian found several spelling errors.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2017-05-24 12:50:29 +02:00
rallytime
d2d9a3d29f Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/ref/cli/salt-cp.rst
  - salt/config/__init__.py
 2017-05-23 15:58:14 -06:00
Dmitry Kuzmenko
583e3b9a5a Update pip version in pip upgrade test by compatibility reason. 
6.0 version doesn't work in a modern environment.
 2017-05-23 11:53:56 +03:00
Dmitry Kuzmenko
d80fa95f10 Add venv version of test_pip_installed_removed to work as non-root. 2017-05-23 11:53:56 +03:00
rallytime
2ba9f644f6 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-20 17:08:39 -06:00
Erik Johnson
edf552fe9a Update PKG_TARGETS for RHEL-based distros 2017-05-18 11:15:06 -05:00
Erik Johnson
acc5f14bae Don't overwrite environment in pip tests 
Potentially fixes https://github.com/saltstack/salt-jenkins/issues/340
 2017-05-17 15:12:35 -05:00
rallytime
d75a7e0d0f Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-12 16:42:54 -06:00
rallytime
bb0f8f32de Update fingerprint hash type default from md5 to sha256 
This PR also removes the warnings that this default with change in
the Nitrogen release, updates the documetation accordingly, and adjusts
some of the affected tests.
 2017-05-11 09:33:45 -06:00
rallytime
4100e2b6a6 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-10 15:32:33 -06:00
rallytime
23ee513397 Pylint: Add extra line above function declaration 2017-05-10 11:32:41 -06:00
Erik Johnson
018ec5fff9 Make git version checks into decorators 
Also fix a bug in one test where edits to a file are made in the current
working directory and not the git repo being used for the test.
 2017-05-10 10:40:12 -05:00
rallytime
317b5e39bd Add git_opts flag to _check_git_version helper funciton 
We only need to skip the tests with git versions < 1.7.2 when
the test uses the git_opts option.
 2017-05-09 13:52:47 -06:00
rallytime
4019db15fb Skip git state tests when using the "git_opts" option 
And also add some gates for if the git version is too low in general.

This fixes the test failures on CentOS 6 currently in the nitrogen branch.
 2017-05-09 13:46:24 -06:00
rallytime
01a012bbdf Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-05 10:12:18 -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
Nicole Thomas
c13f0dc2a8 Revert "Updated ssh fingerprint hash-type default to sah256 for Nitrogen and remove md5 warnings" 2017-05-03 16:49:39 -06:00
Erik Johnson
ee493bae47 Update package targets for Arch pkg tests 
Something else is installing pytz (likely via pip), causing filesystem
conflicts when the pkg integration tests try to install python2-pytz as
a dep of python2-django.

This commit also changes a bunch of the other tests so that they are
explicitly skipped instead of just being no-ops in cases where they are
not configured to be run. This provides more accurate information in the
overall test results.
 2017-05-03 17:02:32 -05:00
Mike Place
3626258f50 Merge pull request #40899 from rallytime/remove-md5-warning 
Updated ssh fingerprint hash-type default to sah256 for Nitrogen and remove md5 warnings
 2017-05-03 10:55:26 -06:00
rallytime
bed524a731 Update test hash to be sha256 instead of md5 2017-05-02 16:20:06 -06:00
rallytime
ecb962cdee Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - salt/runners/saltutil.py
 2017-05-02 09:00:22 -06:00
Mike Place
f766c97e26 Merge pull request #40777 from terminalmage/issue39349 
Add git_pillar integration tests
 2017-05-01 13:51:19 -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
4062bd9fd9
Don't attempt connections at the module level! 2017-04-28 13:33:32 +01:00
Daniel Wallace
eb24f5381a fix pylint 2017-04-25 15:26:12 -06:00
Daniel Wallace
f3825d3f5e skip tests if kazoo is not installed 2017-04-25 12:20:35 -06:00
Daniel Wallace
0ee3ecf464 Add tests for Zookeeper states 2017-04-24 18:01:16 -06:00
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
Mike Place
6da806d1cc Merge pull request #39850 from epcim/pr_fix_keystone_endpoints_multiregion 
Fix endpoint handling per region
 2017-04-23 04:00:00 -06:00
Petr Michalec
ab1dd446e7
Endpoint handling per region, fixes #35874 
- extend tests for multiple regions
- region arg by default set to None
- print verbose changes to be exec.
 2017-04-21 15:48:52 +02: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
Mike Place
69058ae67a
Add flaky decorator to pkg tests 2017-04-06 12:22:40 -06:00
Pedro Algarvio
de5fdc6ba8
Purge the account 2017-04-05 00:51:35 +01:00
Pedro Algarvio
cd1f7ba629
Let's use the system temp dir as it was to see if it fixes the test failure 2017-04-05 00:34:39 +01:00
Pedro Algarvio
7b713d9256
Use the more portable helper skip_if_not_root. 2017-04-04 18:58:21 +01: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
Pedro Algarvio
5950c1dd53
Minor logic fix 2017-04-01 14:22:55 +01:00
Nicole Thomas
d0182ac3ef Merge pull request #40375 from terminalmage/pr-39838 
Cleanup and resubmit of PR #39838 against develop branch
 2017-03-29 10:34:43 -06:00
rallytime
4fbe9f18b8 Use "self.archive_tar_source" instead of undefined ARCHIVE_TAR_SOURCE global 2017-03-29 09:11:46 -06: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
Narendra Ingale
4ac73bb55c Added test for issue 39191. 2017-03-28 14:55:05 -05:00
Ch3LL
8b21b4c8bb add use_cmd_unzip test 2017-03-27 10:32:27 -06:00
Erik Johnson
5ad476936d Overhaul Docker support 
This does the following:

- Splits states for container/volume/image/network management into four
  separate state modules.

- Preserves backward compatibility by making ``docker.image_present``
  invoke ``docker_image.present``, etc.

- Changes how Salt detects that a container needs to be replaced.
  Instead of comparing each passed argument to the named container's
  configuration, it creates a temporary container, and compares that
  container to the named container. If the two differ, then the older
  container is removed, and the new one is renamed and started, becoming
  the named container.

- Removes the unit tests for container management and replaces them with
  integration tests.

- Adds unit tests for the new salt.utils.docker
 2017-03-21 16:53:19 -05:00
rallytime
a6a7538fe4 Pylint fix 2017-03-21 13:39:34 -06: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
rallytime
dd193cc740 Make sure the tornado web server is stopped at the end of the test class 
The tornado web aplication that was set up in the archive tests, and then
duplicated in the remote file integration tests, starts the web server,
but never stops it. This creates a stacktrace that hangs the other test
file that attempts to start the web server.

The Application class has a `listen()` function, but not a `stop()` function.
The change uses the `HTTPServer` class to set up the listening server, but
also has the necessary `stop()` function. (The `listen()` function from the
`Application` class just calls out to the `HTTPServer`'s `listen()` function,
so this works nicely here.)

We can then call the `stop()` function in the `tearDownClass` class method.

I also removed some duplicate STATE_DIR definitions.
 2017-03-20 13:08:17 -06:00
Erik Johnson
5b71db29d5 Use user.present/absent states to manage user in virtualenv test 2017-03-15 17:18:25 -05:00
Erik Johnson
eb09901f36 Simplify the user state integration tests 
Put the skipIf and the destructiveTest decorators on the class instead
of each function. Also added a user.absent to the tearDown to reduce
code duplication.
 2017-03-15 17:16:34 -05:00
Erik Johnson
66596c6d75 Fail test if sudo is missing 2017-03-15 17:15:56 -05:00
Erik Johnson
9b3890b5f2 Fix network test for cases where no network settings are configured 
This allows the test to pass inside a docker container where the
networking is managed by docker and not by the OS' network mangagment
daemon.
 2017-03-15 17:14:29 -05:00
Erik Johnson
ef110baa99 Update git state integration tests for PY3 compatibility 
Python 3 didn't like some of the stuff that we were doing with
``subprocess.check_call()`` in these tests, so to fix this I have redone
that stuff with calls to functions in the git execution module. In order
to avoid problems with running tests with no global gitconfig, I needed
to add an argument called ``git_opts`` to most of the funcs in the git
execution module (well I didn't *need* to do it to most of the funcs, it
just seemed like we shouldn't only be supporting this argument in a
single function).

This new ``git_opts`` argument is specifically for passing arguments to
the git command itself (not the subcommand). For example, ``git -c
user.name="Foo Bar" commit .....`` is different than running ``git
commit -c user.name="Foo Bar" .....``, because the ``commit`` subcommand
for git also accepts ``-c``.
 2017-03-14 18:07:06 -05:00
Pedro Algarvio
410b583a63
The port attribute definition must come first 2017-03-12 18:05:30 +00:00
Pedro Algarvio
992a8c7294
Don't hardcode the webserver port number 2017-03-11 16:00:28 +00: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
51c5558b32
This should no longer hang 2017-03-08 20:43:36 +00:00
Pedro Algarvio
0b41b92d7d
Use salt.utils.versions instead of distutils.version 2017-03-08 19:22:33 +00:00
Pedro Algarvio
7fffd93b50
Don't pollute the repo tests state tree 2017-03-08 18:34:33 +00:00
Pedro Algarvio
b391a4eb5b
Supervisord does not work under Python 3 2017-03-08 18:34:33 +00:00
Pedro Algarvio
e2e303e724
Minor changes to paths 2017-03-08 18:34:32 +00:00
Pedro Algarvio
712b81e0c1
supervisor does not run against py3. Use pep8 for the tests. 2017-03-08 18:34:32 +00:00
Pedro Algarvio
07d0a5ed20
Cleanup after ourselves 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
adacf4cc28
Don't expect any ordering from sets!!!!! 2017-03-03 18:31:11 +00: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
80002276c2
These tests are not destructive 2017-03-02 19:58:10 +00:00
Erik Johnson
64db0b8563 Add integration tests for remote file sources 2017-03-01 10:57:06 -06:00
Pedro Algarvio
a78c037a5f
PyLint, no its not a repeated keyword! 2017-03-01 01:33:08 +00:00
Pedro Algarvio
4f425e596b
Don't assert, just fail 2017-03-01 01:33:08 +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
Erik Johnson
cbdf905b9f Update test to reflect new state comment 2017-02-23 11:21:33 -06:00
Pedro Algarvio
0b3071ee3a
.iter<items|keys|values>() Py3 compatibility 2017-02-22 10:20:26 +00:00
Pedro Algarvio
005f21d3b5
Compare against the normalized mode string 2017-02-13 10:18:58 +00:00
Pedro Algarvio
c1b5606199
Handle bytes vs strings on the file state module tests 2017-02-13 10:18:57 +00:00
Pedro Algarvio
7b7133ea25
This test case requires root permissions 2017-02-13 10:18:56 +00:00