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
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
Pedro Algarvio
38ceeb6f19
These tests are not destructive 2017-03-09 19:31:13 +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
50e49f1353 Merge pull request #39907 from gtmanfred/listen 
Move stuff to make it available for salt-ssh
 2017-03-09 09:33:46 +00:00
rajvidhimar
beba5a7331 Clean up 2017-03-09 11:15:15 +05:30
rajvidhimar
d8363d0958 Unit tests 2017-03-09 10:48:42 +05:30
Daniel Wallace
587b7fc7f3 fix test 2017-03-08 18:53:19 -06:00
Pedro Algarvio
0b41b92d7d
Use salt.utils.versions instead of distutils.version 2017-03-08 19:22:33 +00:00
Pedro Algarvio
af7de9f0ea
One more attribute to clean up 2017-03-08 18:34:35 +00:00
Pedro Algarvio
07d0a5ed20
Cleanup after ourselves 2017-03-08 18:34:32 +00:00
Kadlec Jan
93306ba8a8 Fix linode white space 2017-03-08 17:14:56 +01: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
Kadlec Jan
2c67cfdbdb Add function for matching key/value grains 2017-03-08 15:14:46 +01:00
vnitinv
4faee656c3 Merge remote-tracking branch 'upstream/develop' into develop 2017-03-08 17:30:21 +05:30
rajvidhimar
c49c8860ac More test cases 2017-03-08 00:25:41 +05:30
Pedro Algarvio
3aa54e6e0e
Clean up after ourselves 2017-03-07 12:23:17 +00:00
rajvidhimar
a5527f690f Fix tests 2017-03-07 16:14:23 +05:30
Rafael Caricio
c5a7b68aac
Use new test libs 2017-03-07 11:40:10 +01:00
Rafael Caricio
be2c2fab3f
Move to new style of tests 2017-03-07 09:53:48 +01:00
rajvidhimar
839cb66872 remove old file 2017-03-07 12:40:29 +05:30
rajvidhimar
3abbcc4ad3 Bug fixes 2017-03-07 12:34:09 +05:30
rajvidhimar
3a1b6558b6 Merge remote-tracking branch 'upstream/develop' into salt_test 2017-03-07 12:30:21 +05:30
rajvidhimar
6ff57331c5 Fix few bugs in the salt module 2017-03-07 12:29:09 +05:30
rajvidhimar
002f97bfe8 Adding unit tests 2017-03-07 11:22:15 +05:30
Nicole Thomas
8ecc719f90 Merge pull request #39852 from rallytime/bp-39651 
Back-port #39651 to 2016.11
 2017-03-06 14:18:33 -07:00
dharper
e2a232921d Checking instance exists in master._get_cached_minion_data when cache.fetch returns None 2017-03-06 09:09:03 -07:00
Pedro Algarvio
3ec0870ef6
Disable 3rd-party-module-not-gated 2017-03-06 14:42:31 +00:00
Pedro Algarvio
ffec7dc299
Lint fixes 2017-03-06 14:35:16 +00:00
Pedro Algarvio
6c9152764d
Use tests.support.mock 2017-03-06 14:35:13 +00:00
Pedro Algarvio
d13b40554b
Use the __version__ variable from tests.support.mock 2017-03-06 14:35:12 +00:00
rajvidhimar
691f602e7e Unit tests 2017-03-06 16:58:53 +05:30
rajvidhimar
1f8fe142dd Test cases 2017-03-06 14:55:40 +05:30
rajvidhimar
e047fd74ad Test cases 2017-03-06 12:16:41 +05:30
Rafael Caricio
aa171a5468 Add support to Telegram Bot messages beacon 2017-03-05 16:09:47 +01:00
Pedro Algarvio
69f1c0fc64 Merge pull request #39822 from s0undt3ch/features/py3 
A tiny bit more of py3
 2017-03-03 22:12:11 +00:00
Pedro Algarvio
44ba96613b
This needs to be done as a PyLint plugin not as this kind of test. 
It's the only way we can check all code paths of the __virtual__
function.
Regarding the 3rd-party modules gating, we also need to create a pylint
plugin which known what are the hard deps of Salt and will complain on
all other 3rd-party imports.
 2017-03-03 20:35:17 +00:00
Pedro Algarvio
f4732d5433
Lint fixes 2017-03-03 19:28:45 +00:00
Pedro Algarvio
f5de085ac4
Add test case which will catch SOME problems with __virtual__ calls. 
And also 3rd-party import errors.
 2017-03-03 15:19:34 +00:00
Pedro Algarvio
5f388e7ea2
Minor fixes 2017-03-03 15:19:24 +00:00
rajvidhimar
47f9d32d80 Cover more code 2017-03-03 16:55:05 +05:30
Calle Pettersson
c745415b8b Vault: Always lowercase policies 2017-03-03 09:05:27 +01:00
rajvidhimar
d464a954ac More tests and changes in junos module 2017-03-03 12:48:24 +05:30
Pedro Algarvio
cbef6c044f
Re-enable the test since we now have the flaky decorator 2017-03-02 19:56:05 +00:00
Mike Place
71410047f0 Merge pull request #39682 from ni3mm4nd/mongodb_user 
Add support for user roles in present state
 2017-03-02 10:17:38 -07:00
rajvidhimar
970060e0d4 Unit tests 2017-03-02 10:50:41 +05:30
Joseph Hall
bdb26ddf83 Create master cache dir 2017-03-01 16:09:13 -07:00
rallytime
776a9431b9 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/minion.py
 2017-03-01 16:07:14 -07:00
Joseph Hall
8058bbe6ca Just set all the default minion opts and be done with it 2017-03-01 13:12:18 -07:00
Joseph Hall
925eb7ffea Add environment to test 2017-03-01 12:56:23 -07:00
Mike Place
320b39bc12 Fix broken test and lint issue 2017-03-01 11:57:28 -07:00
Joseph Hall
88a38d5ee9 Add id to test 2017-03-01 11:42:05 -07:00
Erik Johnson
3bb0ebd872 Update tests for PR 39727 
Also reduce the complexity of some of the mocking by adding the cachedir
to the global state.__opts__.
 2017-03-01 12:10:28 -06:00
Joseph Hall
8b8320d56d Add renderer variable to tests 2017-03-01 10:41:52 -07:00
Joseph Hall
bd2e1427ad Add cachedir to test 2017-03-01 10:40:31 -07:00
Mike Place
4fc0451d64 Merge pull request #39702 from techhat/spmfiles 
Add files section to FORMULA files
 2017-03-01 10:18:30 -07:00
Mike Place
4a0c2dfcc3 Merge pull request #39725 from bodhi-space/infra4487 
INFRA-4487 - 'test=True' should return True rather than None if no changes are scheduled.
 2017-03-01 10:02:11 -07:00
Kadlec Jan
d5d99d6399 recteate unit tests 2017-03-01 07:13:28 +01:00
Tom Williams
aa8d822e78 INFRA-4487 - fix unit test to match corrected return value 2017-02-28 21:01:57 -05: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
Pedro Algarvio
53eff91efa
Re-enable the test since we now have the flaky decorator 2017-02-28 22:52:48 +00:00
Pedro Algarvio
2a9d2beb02
The order is shady under Py3 
/cc @cachedout @rallytime
 2017-02-28 22:52:48 +00:00
Pedro Algarvio
1daa2e24cd
Moved some test supporting modules to tests/support 
Previously they were in tests/utils which also had test case modules.
 2017-02-28 22:52:48 +00:00
Mike Place
ec79d238fb Merge pull request #39732 from gtmanfred/develop 
Add queueing of runner tasks using the scheduler and queue runner
 2017-02-28 15:09:43 -07:00
Daniel Wallace
39bb623bdc fix pylint 2017-02-28 14:53:02 -06:00
Daniel Wallace
878b21662e add test for queue 2017-02-28 14:10:41 -06:00
Calle Pettersson
4154910dd3 Vault: Handle patterns with non-existing keys 2017-02-28 21:07:49 +01:00
Nicole Thomas
8809d33674 Merge pull request #39701 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-02-28 12:50:10 -07:00
Joseph Hall
6c5bc20344 Handle paths for multiple operating systems 2017-02-28 11:41:29 -07:00
rallytime
ddf8f87249 Add some additional mocks for win_iis unit test 2017-02-28 10:36:11 -07:00
Mike Place
09ac8822c5 Merge pull request #39672 from carlpett/feature/vault-list-expansion 
Vault: Add support for expanding lists in policies
 2017-02-27 17:33:02 -07:00
Joseph Hall
d1f0a74a7c Add files section to FORMULA files 2017-02-27 16:59:13 -07: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
Mike Place
3037e7de46 Merge pull request #39651 from DennisHarper/fixNoneCache 
Checking Instance when calling a function that can return None
 2017-02-27 13:21:00 -07:00
rallytime
756f1de2d2 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/states/file.py
 2017-02-27 13:13:46 -07:00
Calle Pettersson
6dac1c710e Vault: Add support for expanding lists in policies 2017-02-27 19:55:26 +01:00
dharper
c71753197a Checking instance exists in master._get_cached_minion_data when cache.fetch returns None 2017-02-27 09:37:37 -06:00
rajvidhimar
6b9d89d706 Test cases 2017-02-27 12:44:23 +05:30
Erik Johnson
c7dfb494a6 Fix mocking for grains refresh 2017-02-25 21:04:48 -06:00
Erik Johnson
28564da966 Implement no_block for service.running/service.dead (systemd only) 2017-02-24 15:14:09 -06:00
Daniel Wallace
89101fa342 allow sls_build to be used with states 2017-02-24 11:47:13 -06:00
Pedro Algarvio
0e1e133169
Fix a weird import issue 
```
ImportError: Failed to import test module: unit.modules.docker_test
Traceback (most recent call last):
  File "/usr/lib64/python2.7/unittest/loader.py", line 252, in _find_tests
    module = self._get_module_from_name(name)
  File "/usr/lib64/python2.7/unittest/loader.py", line 230, in _get_module_from_name
    __import__(name)
  File "/testing/tests/unit/modules/docker_test.py", line 39, in <module>
    class DockerTestCase(TestCase):
  File "/testing/tests/unit/modules/docker_test.py", line 103, in DockerTestCase
    @skipIf(_docker_py_version() < (1, 4, 0),
  File "/testing/tests/unit/modules/docker_test.py", line 34, in _docker_py_version
    return docker_mod.docker.version_info
AttributeError: 'module' object has no attribute 'version_info'
```
 2017-02-24 09:11:23 +00:00
Pedro Algarvio
f9015ff1e4
Don't even try to concatenate non string types 2017-02-24 09:11:21 +00:00
Erik Johnson
ca54541abe Add missing unit test for disable func 2017-02-24 01:12:42 -06:00
rajvidhimar
4cc6fd187b Add junos test file 2017-02-24 10:19:24 +05:30
Pedro Algarvio
62f55073c9
Fix test cases(no longer logging errors). 2017-02-24 00:49:33 +00:00
Pedro Algarvio
5d0110d98b
Code cleanup 2017-02-24 00:49:33 +00:00
Pedro Algarvio
ae46b0da3a
Code cleanup 2017-02-24 00:49:32 +00:00
Pedro Algarvio
3a85996d2a
Code cleanup 2017-02-24 00:49:32 +00:00
Pedro Algarvio
f7974b186b
Code cleanup 2017-02-24 00:49:32 +00:00
Pedro Algarvio
7fff27627a
Code cleanup 2017-02-24 00:49:32 +00:00
Pedro Algarvio
5fb0aa5dcf
Code cleanup 2017-02-24 00:49:31 +00:00
Pedro Algarvio
019225ec47
Code cleanup. We aren't even using mock! 2017-02-24 00:49:31 +00:00
Pedro Algarvio
62cf3c454e
Add LoaderModuleMockMixin 2017-02-24 00:49:31 +00:00
Pedro Algarvio
ad3dbee189
Add test case to make sure we always proper test module names from now on 2017-02-23 23:19:46 +00:00
Pedro Algarvio
bdb3cc3d89
Test websockets against the actual tornado application created in salt 2017-02-23 23:19:45 +00:00
Pedro Algarvio
b0794617c5
Fix unit.utils.test_warnings after the rename changes 2017-02-23 23:19:45 +00:00
Pedro Algarvio
4ff190cac6
Fix, simplify, syntax the test_doc unit test 2017-02-23 23:19:45 +00:00
Pedro Algarvio
cb7a25e4a2
Somehow salt.utils.boto3 is "landing" as boto3 in sys.modules 2017-02-23 23:19:43 +00:00
Pedro Algarvio
1e2753c875
Fix imports after renames 2017-02-23 23:19:43 +00:00
Pedro Algarvio
5576f6ed33
Gate it! 2017-02-23 23:19:42 +00:00