Commit Graph

9394 Commits

Author SHA1 Message Date
Anthony Shaw
1efd5a19fb
linting 2017-03-23 22:12:12 +11:00
Anthony Shaw
065e45188d
fix up tests 2017-03-23 20:18:41 +11: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
Bo Maryniuk
9e5bf58e42 Fix test: underscore alias is found 2017-03-21 10:49:18 +01:00
Bo Maryniuk
bceb6d0f56 Add with_deprecated test misconfiguration 2017-03-21 10:48:54 +01:00
Bo Maryniuk
54416ed2e8 Add with_deprecated test with opt-in policy configured 2017-03-21 10:47:26 +01:00
Bo Maryniuk
9f8bb257df Add with_deprecated test with opt-in policy by default 2017-03-21 10:46:53 +01:00
Bo Maryniuk
66dff82062 Fix unit test: log messages has been changed 2017-03-21 09:29:48 +01:00
Bo Maryniuk
52125c732b Pylint: W1699 2017-03-20 22:31:54 +01:00
Bo Maryniuk
fa8bd76c8b Fix unit test for a deprecation decorator policy 2017-03-20 22:31:54 +01:00
Bo Maryniuk
717c39bb4c Add unit test for batch call 2017-03-20 22:31:53 +01:00
Bo Maryniuk
88dc91f9a7 Add unit test for typed returns 2017-03-20 22:31:53 +01:00
Bo Maryniuk
af81a00130 Add unit test for None returns 2017-03-20 22:31:53 +01:00
Bo Maryniuk
88c6e9485b Add docstring to the unit test 2017-03-20 22:31:53 +01:00
Bo Maryniuk
4fa3793bee Add unit test for module.xrun call with the correct unnamed arguments 2017-03-20 22:31:53 +01:00
Bo Maryniuk
796b0e2690 Add unit test to call a function with an unexpected keywords 2017-03-20 22:31:53 +01:00
Bo Maryniuk
2314b49f54 Add unit test to call function with a proper arguments 2017-03-20 22:31:53 +01:00
Bo Maryniuk
3ab7d6c458 Refactor unit tests for reusing constants 2017-03-20 22:31:53 +01:00
Bo Maryniuk
3d63165f16 Add unit test for missing args 2017-03-20 22:31:53 +01:00
Bo Maryniuk
33a16d69cc Add xrun unit test for module is ran in a test mode 2017-03-20 22:31:53 +01:00
Bo Maryniuk
6bbf7232a1 Add test for module is not available 2017-03-20 22:31:53 +01:00
Bo Maryniuk
803b3ce637 Fix existing tests by proper patching and reusing existing constants 2017-03-20 22:31:53 +01:00
Mike Place
aec504173a Merge pull request #40162 from rallytime/archive-integration-test-fixes
Make sure the tornado web server is stopped at the end of the test class
2017-03-20 14:35:20 -06:00
Mike Place
461e15f0f4 Merge pull request #40158 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2017-03-20 14:34:22 -06:00
rallytime
f32d8a8683 Don't try to run the dockerng unit tests if docker-py is missing 2017-03-20 13:34:15 -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
rallytime
f4d4768a6d Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/utils/__init__.py
2017-03-20 11:08:28 -06:00
Ivan Babrou
af1545deed
Use the first address if cannot connect to any
This fixes #39995. The previous work happened in #39289.
2017-03-18 21:09:16 -07:00
Nicole Thomas
201846ff01 Merge pull request #40129 from terminalmage/py3-tests
Python 3 compatibility fixes
2017-03-17 17:49:26 -06:00
Erik Johnson
8676f7d14a Add pip3 to list of commands in which_bin test 2017-03-16 22:07:52 -05:00
Nicole Thomas
d64dee46bd Merge pull request #40061 from rallytime/merge-develop
[develop] Merge forward from 2016.11 to develop
2017-03-16 11:16:52 -06:00
Erik Johnson
3923305141 Sort list of minions in batch to make tests consistent 2017-03-16 12:00:38 -05: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
rallytime
148df32604 Merge branch '2016.11' into 'develop'
No conflicts.
2017-03-15 14:52:07 -06:00
Mike Place
5734e2b0a8 Merge pull request #40027 from terminalmage/py3-tests
Update git state integration tests for PY3 compatibility
2017-03-15 13:40:55 -06:00
Nicole Thomas
ad9878fa51 Merge pull request #40026 from rallytime/flaky-decorator
Add flaky decorator to flaky rest_tornado test
2017-03-15 09:19:47 -06: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
rallytime
fe4a208569 Add flaky decorator to flaky rest_tornado test 2017-03-14 16:30:54 -06:00
Nicole Thomas
08d6b96171 Merge pull request #39977 from bodhi-space/infra4506
INFRA-4506 - various fixes as detailed below
2017-03-14 15:52:32 -06:00
rallytime
029f28bbd5 Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/modules/cmdmod.py
2017-03-14 15:44:38 -06:00
rallytime
f6cd372358 Update boto_asg state file unit test mocks to account for changes in #3997 2017-03-14 14:05:20 -06:00
Mike Place
51fb191157 Merge pull request #39841 from rafaelcaricio/telegram-beacon
Telegram beacon
2017-03-14 13:30:37 -06:00
Mike Place
9495664f0f Merge pull request #40002 from s0undt3ch/features/py3
Minor Py3 test module fix
2017-03-14 12:44:36 -06:00
Nicole Thomas
dd2bcb7c26 Merge pull request #39888 from ni3mm4nd/module_grains
Add function for matching key/value grains
2017-03-14 11:36:40 -06:00
Nicole Thomas
42361596e9 Merge pull request #40009 from gtmanfred/develop
Use linux_distribution from distro if not in platform
2017-03-14 11:18:35 -06:00