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
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
Pedro Algarvio
15af4c9728
Test filenames conformity. Adjust for pytest. 2017-02-23 23:19:42 +00:00
Pedro Algarvio
ce71f6d45f
Code cleanup 2017-02-23 12:55:53 +00:00
Pedro Algarvio
9bb56da613
Fix skipIf call and _docker_py_version 2017-02-23 12:55:52 +00:00
Pedro Algarvio
1416dd2e9a
We must compare tuples 2017-02-23 10:40:59 +00:00
Pedro Algarvio
8dc1c780b7
Add missing mock patch 2017-02-23 10:40:58 +00:00
Pedro Algarvio
e48ea8fa1b
Don't use assert_called_once() or assert_not_called(). 
These worked in Py2 but not in Py3.
A read of http://engineroom.trackmaven.com/blog/mocking-mistakes/ specially the section "Mocking the unexpected" will enlighten one.
 2017-02-23 10:40:58 +00:00
Pedro Algarvio
e16dc832b2
Code cleanup. Tests are not destructive. Py3 compat. 2017-02-23 10:40:58 +00:00
Mike Place
4279c39f41 Merge pull request #39576 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-02-22 19:09:56 -07:00
rallytime
5db986860c [develop] Fix some pylint errors that snuck into develop 2017-02-22 17:02:21 -07:00
rallytime
7b9b3f700d Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/dockerng.py
  - salt/states/dockerng.py
 2017-02-22 16:27:08 -07:00
rallytime
2595ac383d Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/config/__init__.py
  - salt/modules/docker.py
  - salt/states/docker.py
 2017-02-22 16:24:36 -07:00
Mike Place
c10965833a Merge pull request #39289 from bobrik/autodetect-ipv6 
Autodetect IPv6 connectivity from minion to master
 2017-02-22 12:05:32 -07:00
Sergei Zviagintsev
ad5b52ce3c Add unit test for salt.utils.cloud.check_key_path_and_mode 2017-02-22 11:38:40 +01:00
Sergei Zviagintsev
313e9cae06 Add unit test for _validate_key_file_permissions in ec2 module 2017-02-22 11:38:40 +01:00
rallytime
c613d19e76 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/dockerng.py
  - salt/states/dockerng.py
 2017-02-21 13:59:14 -07:00
Mihai Dinca
9fedb84607 Always return oscap's stderr 2017-02-20 10:36:01 +01:00
Mihai Dinca
0ecde2cd02 Include oscap returncode in response 2017-02-20 10:36:01 +01:00
Erik Johnson
ec2b617a5d Fixes for docker tests 
These tests were failing because of improper mocking. The mocks were
assigned to the __salt__ dunder but we should have been patching the
attributes of the docker execution module directly.
 2017-02-18 21:58:25 -06:00
Erik Johnson
c673d06f48 Rename dockerng state/execution module to docker 2017-02-18 21:58:25 -06:00
Erik Johnson
6e24dd85c4 Remove dockerio state/module (moved to salt-contrib) 2017-02-18 21:58:24 -06:00
Mike Place
179e143272 Merge pull request #39385 from curiositycasualty/develop 
modules.file: Return true when a symlink is already in desired state
 2017-02-17 15:24:53 -07:00
Pedro Algarvio
20882bfcb4
These tests require root for default paths and create directories if non existing 2017-02-17 20:48:57 +00:00
Pedro Algarvio
a8e32cf076
**kwargs ordering is different under Py3 2017-02-17 20:48:56 +00:00
Pedro Algarvio
f921c1e131
Sort before asserting since the order changes between py2 and py3 2017-02-17 20:48:56 +00:00
Pedro Algarvio
9503045b05
Use tempfile.gettempdir() since that depends on current user and distro setup 2017-02-17 20:48:56 +00:00
Pedro Algarvio
33d8832e40
Assert different outcome under Py3 2017-02-17 20:48:56 +00:00
Pedro Algarvio
90adbe925f
Force dictionary order 2017-02-17 20:48:56 +00:00
Pedro Algarvio
9b2d79317a
Handle different test outcome under Py3 2017-02-17 20:48:55 +00:00
Pedro Algarvio
1d060096e3
Force ordering under Py3 2017-02-17 20:48:55 +00:00
Pedro Algarvio
04b4d0947e
Disable tests on Py3. 
The order of attributes is sketchy under Py3 and this code will be
deprecated.
 2017-02-17 20:48:55 +00:00
Pedro Algarvio
c093d97a93
Only run the ascii case on Py2 2017-02-17 20:48:55 +00:00
Pedro Algarvio
20a4d7bb39
Under Py3, stat.S_ISLNK() expects an integer. Mock it. 2017-02-17 20:47:55 +00:00
Mike Place
9c4292fb4e Merge pull request #39423 from dincamihai/openscap 
Openscap module
 2017-02-17 11:31:04 -07:00
Mihai Dinca
9d13422ac1 OpenSCAP module 2017-02-17 13:50:29 +01:00
Nicole Thomas
1577bb68af Merge pull request #39459 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-02-16 14:30:31 -07:00
Mike Place
e652a45592
Fix mocks in win_disim tests 2017-02-16 12:26:49 -07:00
rallytime
dda39d4e63 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/minion.py
  - salt/modules/file.py
  - salt/modules/grains.py
  - salt/utils/gitfs.py
 2017-02-16 12:18:46 -07:00
Megan Wilhite
1acf00da3b add 2016.11.3 changelog to release notes (#39451) 2017-02-16 10:49:53 -07:00
rallytime
3a8bd786e0 Remove global dunder definistions from tests 
These dunders are already being mocked appropriately below in the test, so we
don't need to define them in the test module's namespace.

The global definitions here were conflicting with the globals defined in
`saltmod_test.py`, and causing the following stacktrace in the test suite:

```
Traceback (most recent call last):
  File "/root/SaltStack/salt/tests/unit/saltmod_test.py", line 71, in test_state
    self.assertDictEqual(saltmod.state(name, tgt, highstate=True), test_ret)
  File "/root/SaltStack/salt/salt/states/saltmod.py", line 252, in state
    masterless = __opts__['__role'] == 'minion' and \
KeyError: '__role'
```
 2017-02-16 10:33:32 -07:00
rallytime
2acb188ac9 Change `path` value from a tuple to a list 
The type of the ``path`` value changed in #38188.

This updates the type in the unit test, as well as rearranges some
of the imports to be more standardized with ``ensure_in_syspath``.
 2017-02-15 15:39:53 -07:00
Joseph Hall
b34d42f98c Add version control to SPM repo creation 2017-02-15 14:21:03 -07:00
rallytime
6d78adbf08 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/topics/tutorials/gitfs.rst
  - salt/fileserver/roots.py
  - salt/loader.py
 2017-02-15 10:35:02 -07:00
Nicole Thomas
3a39e15dff Rewrite blockdev unit test to target more specific state returns (#39402) 
The previous way this test was written was over-mocking some of the
state returns as well as tested and asserted against incorrect
behavior as shown in issue #39255. (The test asserted that a return
of '' from the call to _checkblk() was correct, which was hiding a
bug as noted in #39255 and fixed in #39272.)
 2017-02-14 13:49:14 -07:00
Ivan Babrou
e8a2cc0488
Do no try to connect to salt master in syndic config test 2017-02-14 11:16:32 -08:00
Mike Place
1ecc9d1315 Add newline for lint 2017-02-14 11:26:23 -07:00
Mike Place
2b67008770 Merge pull request #39374 from techhat/spmcache 
Switch SPM to salt.cache
 2017-02-14 10:58:10 -07:00
Mihai Dinca
91383c5a19 Add cp.push test 2017-02-14 17:16:28 +01:00
Isa
72d2188cbb return true when symlinks already in desired state 2017-02-13 18:10:28 -08:00
Joseph Hall
4f072c9ad8 Add cache default for spm 2017-02-13 16:59:07 -07:00
mephi42
6570392abd Support globbing in sources parameter of salt.modules.archive (#32356) 
Add globbing support to tar, zip and rar.
Update tests to show bad return value on error.
 2017-02-14 00:02:19 +01:00
Mike Place
03ab8b1b5a Merge pull request #39303 from kstreee/fix-testcase-rm-batch-in-netapi 
Removes a redundant test case after removed 'batch' in 'netapi'.
 2017-02-13 12:55:46 -07:00
Daniel Hobley
3a3ef25b51 Fix add beacon when there are no devices 
- Changed the assumption that having 0 lines means there are no devices, to actually checking there are no devices
 2017-02-13 13:33:52 +01:00
Michael Calmer
17521fb23c added unit test for dockerng.sls_build dryrun option (#39305) 2017-02-10 16:11:26 -07:00
kstreee
51972d0724 Removes a redundant test case after removed 'batch' in 'netapi'. 2017-02-10 07:12:22 +00:00
rallytime
609e6e4b23 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/config/__init__.py
  - salt/modules/win_lgpo.py
  - salt/utils/aws.py
  - tests/unit/utils/schema_test.py
 2017-02-09 10:29:40 -07:00
Erik Johnson
d35c2f810c salt.utils.gitfs: remove dulwich support, make refspecs configurable (#39210) 
* Add config params for custom refspecs

* Add exceptions for errors encountered modifying git config

* Make the refspecs a configurable parameter

* Make refspecs a per-remote parameter

* Update master config template to include custom refspecs opts

* Add documentation for new config params

* Update GitFS walkthrough with a section on custom refspecs

* Remove dulwich support from salt.utils.gitfs

Dulwich still lacks important features, including (but not limited to)
the following:

- Lack of the necessary support for checking out a ref needed for
  git_pillar/winrepo support

- No support in its config objects for multivar git config items, making
  it impossible to detect when repos have multiple refspecs set for a
  given git remote

Given this information, and the fact that it trails as a distant third
to Pygit2 and GitPython, Salt will cease to support Dulwich as a git
interface moving forward.

* Excise references to dulwich from documentation

* Add mention of custom refspecs to Nitrogen release notes

* Add gitfs_refspecs to mocked opts in gitfs integration tests

Also remove dulwich from unit tests

* Add information about opts argument not being intended for CLI use
 2017-02-09 09:50:45 -07:00
Nicole Thomas
63c7c79455 Fix the new jinja_test failures (#39262) 
Refs #37808

The max fuction returns an int, not a float, as does the min function.
This updates the assertions to compare against ints.
 2017-02-09 08:53:00 -07:00
Nicole Thomas
05d4df4a0e Add __utils__ to sdb unit test (#39261) 
Refs #39174
 2017-02-09 08:52:16 -07:00
rallytime
a9c2c106c1 Pylint fix 2017-02-09 08:50:56 -07:00
rallytime
f6aad99db2 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/loader.py
  - salt/output/highstate.py
  - salt/runners/fileserver.py
 2017-02-08 16:57:54 -07:00
Erik Johnson
1b9217d636 Update jsonschema tests to reflect change in jsonschema 2.6.0 (#39260) 
Version 2.6.0 changed the wording of one of the exceptions tested,
causing tests to fail when jsonschema 2.6.0 is installed. This commit
updates the tests to change the assert for 2.6.0 and later.
 2017-02-08 16:51:56 -07:00
Nicole Thomas
84ff63875c [2016.11] Merge forward from 2016.3 to 2016.11 (#39234) 
* Fix for #38697

* Lint fixes

* Added missing source_hash_name argument in get_managed function
Additional fix to  #33187
Customer was still seeing errors, this should now work.
Tested with 2015.8.13 and 2016.11.2

* [2016.3] Pylint fix (#39202)

* Ignore empty dicts in highstate outputter

Closes #37174

* Sort the return list from the fileserver.envs runner

* Fix the win_ip_test failures (#39230)

The changes made in #38793 changes the "get_all_ointerfaces" call
to be a list of DNS servers. This change adjusts the tests structure
from a string to a list and fixes the test failure.
 2017-02-07 16:06:56 -07:00
Nicole Thomas
ef4e437bbc Fix the win_ip_test failures (#39230) 
The changes made in #38793 changes the "get_all_ointerfaces" call
to be a list of DNS servers. This change adjusts the tests structure
from a string to a list and fixes the test failure.
 2017-02-07 14:53:59 -07:00
Mike Place
d5d39321c8 Merge pull request #37808 from cloudflare/JINJA-FILTERS 
Jinja filters
 2017-02-07 14:52:23 -07:00
Mike Place
0b480a6244 Merge pull request #39140 from eradman/pillarenv 
Allow pillar environment to be specified for salt-run
 2017-02-06 11:38:35 -07:00
Mike Place
30455079fe Merge pull request #39153 from nicholasmhughes/fix-selinux.mode-config-predictability 
Fix selinux.mode state config file handling
 2017-02-06 11:37:34 -07:00
Mike Place
b240468525 Merge pull request #39162 from meaksh/snapper-module-improvements 
Adding more function to Snapper module
 2017-02-06 11:33:52 -07:00
nicholasmhughes
8d8ba9c7d2 added the new getconfig function to the test 2017-02-06 09:55:09 -05:00
rallytime
88cc195a2a Merge branch '2016.11' into 'develop' 
No conflicts.
 2017-02-03 10:58:55 -07:00
Mike Place
fa525567cf Merge pull request #39150 from rallytime/python3-compat-fixes 
Python 3 Test Fixes
 2017-02-03 10:13:58 -07:00
rallytime
6504bb6b02 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/pillar.py
  - salt/states/archive.py
  - tests/integration/states/archive.py
 2017-02-03 09:48:58 -07:00
Pablo Suárez Hernández
9d6a33f257 Adds 'snapper.create_config' unit tests 2017-02-03 15:41:58 +00:00
Pablo Suárez Hernández
d38ed505f8 Adds 'snapper.modify_snapshots' unit tests 2017-02-03 15:41:29 +00:00
Pablo Suárez Hernández
d5496ccc99 Adds 'snapper.delete_snapshots' unit tests 2017-02-03 15:41:29 +00:00
rallytime
4595f81685 [PY3] Sort return data and mock data for testing stability 2017-02-02 22:56:00 +00:00
rallytime
ee2edda14e [PY3] Test comment contents more carefully for list stability 
Stabilizes these tests by avoiding errors when cheese, crackers
order changes in the comment and gives errors like:

-  'comment': 'Kernel modules crackers, cheese are already present',
?                                     --------

+  'comment': 'Kernel modules cheese, crackers are already present',
?                            ++++++++
 2017-02-02 22:34:20 +00:00
Eric Radman
c22f3f6dc7 Allow pillar environment to be specified for salt-run 
Example:
  salt-run state.sls deploy saltenv=base pillarenv=dev
 2017-02-02 13:19:20 -05:00
rallytime
eb61788f87 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/runners/all/index.rst
  - salt/modules/win_lgpo.py
  - salt/states/dockerio.py
 2017-02-01 16:36:45 -07:00
Erik Johnson
646b9ea4e5 Don't abort pillar.get with merge=True if default is None (#39116) 
* Don't abort pillar.get with merge=True if default is None

This prevents a SaltInvocationError from being raised if the default is
loaded from a import_yaml jinja macro and the file being loaded is empty
(which is an entirely valid use case). In these cases, the loaded
default would be None, which we don't want to cause an exception.

* Add test case for issue 39062
 2017-02-01 15:07:31 -07:00
Mike Place
2f532ff9f8 Merge pull request #39080 from kraney/boto_lambda_envvar 
Added Lambda environment variables support to boto_lambda modules/states
 2017-01-31 13:20:40 -07:00
Mike Place
86b4b77bfe Merge pull request #39058 from sergeizv/fix-lvm-fullversion 
Fix salt.modules.linux_lvm.fullversion
 2017-01-31 12:01:12 -07:00
Winston Liu
c2d35d181f update botocore dependencies, skip if not met. 2017-01-31 10:49:34 -08:00
Sergei Zviagintsev
f4bf77a996 Fix test name (#39061) 
Remove an unnecessary underscore character from the name of the
linux_lvm.lvdisplay test:

  test__lvdisplay -> test_lvdisplay
 2017-01-31 10:20:13 -07:00
Sergei Zviagintsev
0f84ca2487 Add test for modules.linux_lvm.pvcreate on existing LVM PVs 
If all the devices submitted to pvcreate() are already initialized as
LVM physical volumes, pvcreate() should return True and no futher
actions should be made.
 2017-01-31 17:57:21 +01:00
Sergei Zviagintsev
3967992bfd Fix test for modules.linux_lvm.pvcreate 
pvdisplay() would be called by pvcreate() twice: firstly to check
whether a device is already initialized for use by LVM and then to
ensure that the pvcreate executable did its job correctly. The test
replaces pvdisplay() with a mock that always returns True and thus
pvcreate() would think that a specified device is already initialized
and exit. In the other words, instead of testing physical volume
initialization the test simulates a case with all the submitted
devices already initialized.

Fix it by replacing pvdisplay with a mock that returns False on the
first call (thus pvcreate thinks that a device is not a PV yet) and True
on the second call (after the pvcreate executable is called).
 2017-01-31 17:49:28 +01:00
Sergei Zviagintsev
fb7ef99838 Fix mock emulating lvm version 
'lvm version' produces multiline output whereas test_version and
test_fullversion use mocks with single-line output. Use real-life
'lvm version' output in those mocks instead.
 2017-01-31 16:22:38 +01:00
Winston Liu
dc8344f0c2 updated boto_lambda execution module with 'lambda environment variables' 2017-01-30 16:00:16 -08:00
Nicole Thomas
7fa89303a1 Merge pull request #39026 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-01-30 10:39:18 -07:00
Julien BONACHERA
1e06f388bb make openvswitch state work with python3 (#38873) 
* openvswitch: add a basic unit test for openvswitch

* openvswitch: enclose comments_* variables into a map

* openvswitch: only prepare error messages if type parameter is present

* openvswitch: add test case: create a GRE port

* openvswitch: remove trailing whitespace

* openvswitch: add missing "comments" variable

* openvswitch: pep8 compliance

* openvswitch: mock dig.check_ip

* openvswitch: rename "type" argument into "tunnel_type"

* openvswitch: reference bridge_exists before assignment

* openvswitch: reference port_list before assignment

* openvswitch: add upgrade note about "type" option renaming
 2017-01-30 09:56:10 -07:00
rallytime
8928436bdd Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/pillar/__init__.py
 2017-01-30 09:06:27 -07:00
rallytime
fc3c9182ae [PY3] Fix find module unit tests 
These unit tests exposed a bunch of python 3 incompatibilities in the
filebuffer util as well as the find util. The filebuffer changes should
be reviewed carefully.
 2017-01-27 14:59:24 -07:00
rallytime
b0631ce005 [PY3] Fix timezone module unit tests 
When writing to a file, the string needs to be converted to bytes first.
 2017-01-27 12:15:39 -07:00
rallytime
76e95087fd Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-01-27 11:52:03 -07:00
rallytime
4b3ff0fe0f Skip the test_badload test until Jenkins move is complete 
Once this happens, we need to re-enable the test. The move over
should also allow us to upgrade the version of salt-testing that
is applied to the test VMs. Once this is complete, we can apply
the `@flaky` decorator to this test. (salt-testing must be a
version newer than the September release.)
 2017-01-27 09:51:30 -07:00
rallytime
e91fcbeaac Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/minion.py
  - salt/modules/dockerng.py
  - salt/thorium/key.py
 2017-01-26 16:02:06 -07:00
rallytime
fdaa5ac1b0 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/master.py
  - salt/pillar/__init__.py
  - salt/utils/__init__.py
 2017-01-26 14:09:37 -07:00
Nicole Thomas
ca090fff1a Add new logging options to parsers_test mock for develop (#38974) 2017-01-26 12:47:23 -07:00
Nicole Thomas
a6c6e47842 Handle changing "is_default" value in moto package for boto test mock (#38973) 2017-01-26 12:05:30 -07:00
Mike Place
3ec806c003 Merge pull request #38940 from isbm/isbm-sanitizers-fix-and-unit-test 
Isbm sanitizers fix and unit test
 2017-01-25 13:15:55 -07:00
Bo Maryniuk
a112b790fe Fix typo 2017-01-25 21:15:05 +01:00