Commit Graph

9414 Commits

Author SHA1 Message Date
Sergey Kizunov
64d224ad02 rabbitmq: Do not use __context__ for persistent globals
The rabbitmq module was using `__context__` to store paths of
rabbitmq executables. `__context__` may be cleared but the module
still could remain in use, in which case it would fail to work
correctly. Move the paths of the rabbitmq executables to their own
global variables so that they are not affected by the lifespan of
`__context__`.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2017-03-23 14:46:36 -05:00
Mike Place
e462a04d70 Merge pull request #40200 from DSRCorporation/features/zh864_auth_redesign
E-Auth refactoring
2017-03-23 13:32:20 -06:00
Nicole Thomas
1d66961ce7 Merge pull request #40242 from rallytime/merge-develop
[develop] Merge forward from 2016.11 to develop
2017-03-23 13:31:39 -06:00
twangboy
72cb96a642 Fix parser for windows... again... 2017-03-23 12:24:26 -06:00
Mike Place
7cde4936d9 Merge pull request #40213 from twangboy/win_tests_decode_names
Decode test names in names-file
2017-03-23 10:50:40 -06:00
rallytime
62b31d7620 Pylint fixes 2017-03-23 10:00:20 -06:00
rallytime
455783a2ef Add ImportError to exception instead of bare "except"
Fixes lint error on develop.
2017-03-23 09:01:51 -06:00
Pedro Algarvio
415dcc1a99 Merge pull request #40234 from terminalmage/py3-tests
More PY3 fixes in test suite
2017-03-23 09:15:18 +00:00
rallytime
235a768872 Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/returners/influxdb_return.py
  - salt/states/dockerng.py
  - salt/utils/schedule.py
  - tests/unit/modules/test_docker.py
  - tests/unit/states/dockerng_test.py
  - tests/unit/utils/test_schedule.py
2017-03-22 17:44:08 -06:00
Erik Johnson
1cdf5ea737 PY3 compatibility fixes to netapi tests 2017-03-22 16:09:56 -05:00
twangboy
fd4beaa856 Use Py2 check instead of Py3 check 2017-03-22 13:51:52 -06:00
twangboy
9c8ad6d365 Detect py3 before decode 2017-03-22 13:37:50 -06:00
Erik Johnson
20724839a9 Fix for running just the grains tests
The -G/--grains/--grains-tests option was being ignored because a suite
was not defined for it. This adds the option, and also adds a dunder
init to satisfy the test parser.
2017-03-22 14:11:22 -05:00
Mike Place
e9a4e8548b Merge pull request #40210 from rallytime/test-skip
Skip flaky test for now
2017-03-22 10:34:40 -06:00
Dmitry Kuzmenko
37b35a19c7 Bugs and tests fixes. 2017-03-22 16:00:51 +03:00
twangboy
8eefbe8111 Decode test names in names-file 2017-03-21 17:12:18 -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
0ba773d86b Skip flaky test for now 2017-03-21 15:47:20 -06:00
rallytime
a6a7538fe4 Pylint fix 2017-03-21 13:39:34 -06:00
Nicole Thomas
82cee58e72 Merge pull request #40194 from terminalmage/fix-docker-test-imports
Change imports for dockerng tests
2017-03-21 13:34:54 -06:00
Erik Johnson
6caedb0de8 Change imports for dockerng tests
This should fix path issues in the test suite.
2017-03-21 11:56:29 -05:00
Mike Place
d9cb222aa8 Merge pull request #40034 from sp1r/fix-pillar-scheduling
Disallow modification of jobs from pillar with schedule execution module
2017-03-21 10:36:33 -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