valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
80,387 Commits 24 Branches 182 Tags 341 MiB
3299f5b2ea
Commit Graph

5506 Commits

Author SHA1 Message Date
Pedro Algarvio
1f7a0aa65b
Proper mocking 2017-03-28 19:00:51 +01:00
Pedro Algarvio
87e9f5e676
Mock patching. The right way. 2017-03-28 19:00:51 +01:00
Pedro Algarvio
b25b26e23d
Cleanup test attributes once finished 2017-03-28 19:00:51 +01:00
Pedro Algarvio
6f79dd6af3
Not an integration test 2017-03-28 19:00:51 +01:00
Pedro Algarvio
993c488ea7
Cleanup attributes 2017-03-28 19:00:50 +01:00
Pedro Algarvio
6b22c6419f
Fixed tests not written for py3 
The tests happened to work because py2 does not default to absolute
imports, contrary to py3.
Additionally, with py3 absolute imports we must remove imported libs
from `sys.modules`(not salt loader modules)
 2017-03-28 19:00:50 +01:00
Pedro Algarvio
7219a35656
These are not integration tests 2017-03-28 19:00:50 +01:00
Mike Place
d7e745a53a Merge pull request #40281 from terminalmage/rename-docker 
Rename docker execution module to avoid shadowing in the loader
 2017-03-28 11:06:08 -06:00
Mike Place
d8cabca9a6 Merge pull request #40349 from ferringb/develop 
ticket #40348: fix pillar include key nested support
 2017-03-28 11:04:19 -06:00
Mike Place
b6032215e9 Merge pull request #40299 from amendlik/saltify-authtest 
Saltify authtest
 2017-03-28 10:17:02 -06:00
Mike Place
2d2cb5b837 Merge pull request #40333 from gtmanfred/2016.11 
fix some test=True comments
 2017-03-28 10:11:00 -06:00
Erik Johnson
774a3f1147 Rename docker execution module to avoid shadowing in the loader 
With the merging of #39996, salt/modules/docker.py now imports
salt.utils.docker. However, our loader appends the module dir (in
this case salt/modules/) to sys.path temporarily for the length of the
loading process. So, as the docker execution module tries to import
salt.utils.docker, when salt.utils.docker attempts to do an "import
docker", and docker-py is *not* installed, this results in
salt/modules/docker.py (the docker execution module) being loaded in its
place, which results in tracebacks in the minion log.

Renaming the docker execution module keeps this import shadowing from
occurring. Note that we don't need to do this for the placeholder
salt/states/docker.py as it does not import salt.utils.docker.
 2017-03-28 10:50:47 -05:00
zer0def
d68067f1d7 Merge remote-tracking branch 'main/2016.11' into pip-cache-fixes 2017-03-28 16:39:19 +02:00
zer0def
4f23a23ca8 Fixed the test_install_download_cache_argument_in_resulting_command to accomodate introduced cache directory argument fixes and renamed it to test_install_download_cache_dir_arguments_in_resulting_command. 2017-03-28 11:53:54 +02:00
Adam Mendlik
6c6e8d17bc Update unit test for Saltify with credential verification 2017-03-27 19:20:38 -06:00
Mike Place
75565df5da Merge pull request #39884 from Juniper/develop 
unit tests for junos specific code
 2017-03-27 18:35:58 -06:00
Brian Harring
80ebd77d67 ticket 40348: fix pillar include key nested support 
Extend pillar include support so that nesting is possible
for the key directive.

Given the following pillar files:

foo1.sls:
include:
- foo:
    key: two:levels

foo2.sls:
foon: blah

After this commit, it'll result in the following pillar data:

two:
  levels:
    foon: blah

Currently, it results in the following data which is far less useful
for usage, and in ability to be addressed:

two:levels:
  foon: blah
 2017-03-27 17:19:24 -07:00
Mike Place
e15e65dc9f Merge pull request #40276 from skizunov/develop2 
rabbitmq: Do not use `__context__` for persistent globals
 2017-03-27 17:37:26 -06:00
Daniel Wallace
5596620dfb fix some test=True comments 
Alternatives should say it is setting the symlink to `path` instead of
`current` which it is already set to

ssh_auth.absent should say it is going to remove the key, unless the status is
set to `add`, then it is already absent

Fixes #40322
Fixes #40321
 2017-03-27 18:19:52 -05:00
Mike Place
2b7b2f1cb4 Merge pull request #40285 from rallytime/docker-test-fixes 
Dockerng unit tests fixes: isolate global variables
 2017-03-27 17:05:02 -06:00
rallytime
0f263a52e0 Mock out the get_client_args mocks in the dockerng module tests more aggressively 
The tests pass fine when run independently, but when the full unit test suite
runs, the dockerng state tests are setting global values. This change makes the
module tests avoid those problem by relying on its own mocks.
 2017-03-27 11:27:52 -06:00
Nicole Thomas
74cc74d784 Merge pull request #40246 from tonybaloney/fix_libcloud_dns_bug 
Fix libcloud_dns state module bug
 2017-03-27 08:49:13 -06:00
vnitinv
a9acd532d1 fix lint in test_junos.py 2017-03-27 11:33:42 +05:30
rajvidhimar
f629feaabd Take care of import error and add condition to skip tests if PyEZ is not installed 2017-03-26 17:27:32 +05:30
Anthony Shaw
ee0daa1b64
remove unused imports 2017-03-25 11:44:55 +11:00
rallytime
c65d602f60 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/cli/batch.py
 2017-03-24 17:11:49 -06:00
Pablo Suárez Hernández
9174e6f281 Fixes testing opts dict for batch unit tests 2017-03-24 17:22:57 +00:00
rallytime
f1352fe253 Add one more dockerng.version mock that was missed previously 2017-03-24 10:57:12 -06:00
vnitinv
146f8abc4c sync with upstream 2017-03-24 12:18:14 +05:30
Anthony Shaw
10c84303db
fix unit tests 2017-03-24 15:13:03 +11:00
Anthony Shaw
605a12dbc0
linting 2017-03-24 14:05:19 +11:00
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
rallytime
0d31d2c4d1 Add a couple more patches for docker.version information 2017-03-23 12:57:46 -06:00
rallytime
a9c5eebaf0 Clean up dockerng unit tests to avoid global variables and fixup some patching 2017-03-23 12:44:57 -06:00
rallytime
62b31d7620 Pylint fixes 2017-03-23 10:00:20 -06:00
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
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
Dmitry Kuzmenko
37b35a19c7 Bugs and tests fixes. 2017-03-22 16:00:51 +03:00
rajvidhimar
2868755128 Remove usage of nose in junos unit tests 2017-03-22 17:08:19 +05:30
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
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
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
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
Vyacheslav Spiridonov
9d5db1910c fix initial data structure for schedule tests 2017-03-15 21:02:08 +03:00
Vyacheslav Spiridonov
d3a2489c9c schedule tests to ensure pillar jobs are not modified 2017-03-15 18:36:15 +03:00
vnitinv
1b726b7f2e moving import unittest2 to unittest 2017-03-15 15:53:39 +05:30
vnitinv
24dcee86a9 Merge remote-tracking branch 'upstream/develop' into develop 2017-03-15 15:52:22 +05:30
Nitin Kr
8c6f636a06 Merge pull request #20 from rajvidhimar/salt_test 
Lint changes
 2017-03-15 11:16:09 +05:30
rajvidhimar
dc2e3f4f2e Clean up lint 2017-03-15 10:42:10 +05:30
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
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
350edbe7e6 Remove unused import in test_core.py 2017-03-14 10:28:42 -06:00
Jan Kadlec
a797a58ee6 Change function name to equals 2017-03-14 17:15:52 +01:00
Daniel Wallace
b839193443 Use linux_distribution from distro if not in platform 
http://bugs.python.org/issue1322

python 3.7 is deprecating the platform.{linux_distribution,dist}
functions.  They are being moved to the `distro` module on pypi.  This
adds support for using the distro module if platform does not have the
needed functions.
 2017-03-14 10:09:47 -05:00
Nitin Kr
30b0e1c9cd Merge pull request #19 from rajvidhimar/salt_test 
Fixed broken unit tests
 2017-03-14 17:52:17 +05:30
rajvidhimar
0393ffab1c Took care of commits 2017-03-14 17:51:17 +05:30
rajvidhimar
9c6b7279dc Fixed broken unit tests 2017-03-14 17:46:04 +05:30
Nitin Kr
62e0281f85 Merge pull request #18 from rajvidhimar/salt_test 
More unit tests
 2017-03-14 17:41:56 +05:30
Pedro Algarvio
7e58bde7d0
We need to compare lists under Python3 not dict_keys vs list 2017-03-14 02:17:30 +00:00
Jan Kadlec
ea7faa0935 Rename function key_value_match to is 2017-03-11 07:35:24 +01:00
rallytime
9ddf032e8e Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - salt/beacons/status.py
  - salt/modules/saltutil.py
  - salt/utils/schedule.py
  - tests/integration/modules/test_beacons.py
  - tests/unit/beacons/inotify_beacon_test.py
 2017-03-10 14:57:31 -07:00
Mike Place
899e037f0a Merge pull request #39932 from rallytime/cp-beacon-fixes 
Cherry-pick the beacon fixes made in #39930 to 2016.11
 2017-03-09 17:21:08 -07:00
Nicole Thomas
c2d4d17589 Merge pull request #39770 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-03-09 15:00:17 -07:00
rallytime
4a52cca926 Pylint fixes 2017-03-09 14:55:33 -07:00
Pedro Algarvio
be06df9b64 Remove *args, **kwargs. Not needed, not useful. 2017-03-09 13:11:07 -07:00
Pedro Algarvio
4a242829ee These tests aren't even using mock! 
Conflicts:
  - tests/unit/beacons/inotify_beacon_test.py
 2017-03-09 13:10:43 -07:00
Pedro Algarvio
6408b123e7 These tests are not destructive 
Conflicts:
  - tests/unit/beacons/inotify_beacon_test.py
 2017-03-09 13:09:32 -07:00
Pedro Algarvio
8f5fc49fcc
Add test case for the status beacon. Refs #38121 
Tests proper handling of both the old configuration format and the new one
 2017-03-09 19:33:13 +00:00
Pedro Algarvio
d56d6059f0
Remove *args, **kwargs. Not needed, not useful. 2017-03-09 19:31:14 +00:00
Pedro Algarvio
17c9490a45
These tests aren't even using mock! 2017-03-09 19:31:14 +00:00