Nicole Thomas
2c688ec87c
Merge branch 'develop' into test_true_minion
2017-12-05 17:55:21 -05:00
Tom Williams
ef414cb2f2
INFRA-5980 - fix other unit test :)
2017-12-05 17:24:25 -05:00
Erik Johnson
01a76919cb
Add hide_output option to cmd state/exec module
...
We have `output_loglevel` for controlling logging, but no corresponding
option to suppress the output from the command from being returned. This
adds a `hide_output` option to do that.
Additionally, this removes the rest of the references to the
long-since-deprecated `quiet` argument from the cmd execution module,
and adds a warning to states which use this argument. `quiet` appears to
have been incompletely removed following its deprecation. It was not
being passed to _check_loglevel(), so it was essentially ignored, but it
was still being accepted as an argument by several functions. Those
references to what has for some time now been a no-op argument are now
removed.
2017-12-05 16:10:02 -06:00
Nicole Thomas
0298f99d81
Merge branch 'develop' into 44606_glusterfs_peered_self_detection
2017-12-05 16:55:15 -05:00
Nicole Thomas
49464dc755
Merge branch 'develop' into fixpip
2017-12-05 16:04:36 -05:00
Jorge Schrauwen
18272955ee
Merge branch 'develop' into issue44404
2017-12-05 21:11:09 +01:00
Nicole Thomas
59dc7cd96f
Merge pull request #43980 from fishhead108/add-cloud.vmware.convert_to_snapshot-feature
...
Add convert_to_template feature for cloud.vmware
2017-12-05 14:59:28 -05:00
Nicole Thomas
47f850d6ba
Merge branch 'develop' into add-cloud.vmware.remove_snapshot-feature
2017-12-05 14:57:37 -05:00
Nicole Thomas
b0008b8ec3
Merge branch 'develop' into sentry_return
2017-12-05 14:48:58 -05:00
Ch3LL
cdbacfaf5c
Remove minions_state_test arg and use default test arg
2017-12-05 14:12:24 -05:00
Ch3LL
499541a8e8
Add new option minions_state_test to enable test on master side
2017-12-05 14:12:20 -05:00
Benedikt Werner
449535edbd
Fix masterapi AutoKey test
2017-12-05 18:18:27 +01:00
Nicole Thomas
23d151b40a
Merge pull request #44784 from rallytime/merge-2017.7-1
...
[2017.7] Merge forward from 2016.11 to 2017.7
2017-12-05 12:13:48 -05:00
Adam Mendlik
de5cdde2c1
Fix failing tests for YAML SDB module
2017-12-04 17:42:04 -07:00
Adam Mendlik
5980860f06
Fix lint error in sdb/__init__.py
2017-12-04 17:41:52 -07:00
Adam Mendlik
a3ab2028ad
Make GPG decryption optional for YAML SDB module
2017-12-04 17:41:41 -07:00
Adam Mendlik
5236a2c059
Add tests for YAML SDB module
2017-12-04 17:41:35 -07:00
Nicole Thomas
8e2e1f957e
Merge pull request #44772 from terminalmage/issue36275
...
Rename environment config option to saltenv, introduce lock_saltenv option
2017-12-04 16:49:23 -05:00
Nicole Thomas
2ad2d4e27d
Merge branch 'develop' into add-vmware-vm-management
2017-12-04 16:41:37 -05:00
Nicole Thomas
0697ed0645
Merge branch 'develop' into accept-minions-from-grains
2017-12-04 16:10:32 -05:00
twangboy
0ff9fa498a
Fix test_directory
2017-12-04 14:05:54 -07:00
twangboy
d5dd42aebe
Fix integration tests for Windows
2017-12-04 14:05:53 -07:00
twangboy
a24b964ea5
Fix unit test to handle new Exception
2017-12-04 14:05:52 -07:00
twangboy
4602f499a2
Remove loader module mixin, add linux paths
2017-12-04 14:05:52 -07:00
twangboy
99b27c037f
Add tests to avoid future regression
2017-12-04 14:05:51 -07:00
Nicole Thomas
da45a7b547
Merge pull request #44555 from mcalmer/develop-teach-pkg-about-provides-try2
...
Teach pkg state to optionally install capabilities
2017-12-04 15:55:12 -05:00
Nicole Thomas
714d057295
Merge branch 'develop' into move-44053
2017-12-04 12:53:59 -05:00
pjcreath
518e709f35
Merge branch 'develop' into add_file_tree_environments
2017-12-04 11:46:36 -05:00
pjcreath
0e6028e09f
Make requested changes, fix inaccurate test description.
2017-12-04 11:35:04 -05:00
Bo Maryniuk
0d2675c4fe
Use variable, instead of direct value
2017-12-04 15:51:56 +01:00
Bo Maryniuk
1ddc47da0a
Add unit test for _get_pillar_errors when external pillar is clean and internal contains errors
2017-12-04 15:51:56 +01:00
Bo Maryniuk
68480d5dc9
Add unit test for _get_pillar_errors when both external and internal pillars contains errors
2017-12-04 15:51:56 +01:00
Bo Maryniuk
218a59e93b
Add unit test for _get_pillar_errors when external pillar has errors and internal is clean
2017-12-04 15:51:56 +01:00
Bo Maryniuk
3ce19356c2
Add unit test for _get_pillar_errors when external and internal pillars are clean
2017-12-04 15:51:56 +01:00
Bo Maryniuk
67034139d9
Fix unit test: wrong error types in side effect
2017-12-04 15:51:56 +01:00
Bo Maryniuk
d9359bca13
Bugfix: unit test mistakenly expects pillar errors as a string, while it is a list
2017-12-04 15:51:56 +01:00
Michael Calmer
b6365aee3c
fix order of parameters in unit tests
2017-12-04 15:38:22 +01:00
Nicole Thomas
4ebac09f60
Merge pull request #44735 from gracinet/42713_backport_2017.7
...
Backported issue #42713 to 2017.7
2017-12-03 20:43:22 -05:00
Erik Johnson
153bf45b03
Fix regression in file.managed when source_hash used with local file
...
This ensures that we enforce the passed source_hash when the source is a
file local to the minion.
2017-12-03 00:01:44 -06:00
Jorge Schrauwen
9e163c847e
Only update props when changed in zpool.present
...
We make sure the values conform to what zfs expects, this should
fix the unneeded updates as mentioned in #44404
Additional test for zpool.get with whitespaces in the result.
2017-12-02 16:00:06 +01:00
Jorge Schrauwen
0e9fe895e3
Add new unit tests for zfs.list and zfs.get
...
Parsable output needs new unit tests. I update the old tests with fresh
data from one of my test systems and create new tests for the same data
but with the parsable output flag set. These tests also test the new
code that converts numbers to actually numeric values.
2017-12-02 13:42:19 +01:00
Jorge Schrauwen
0813183fe8
Add new unit tests for zpool.list and zpool.get
...
Parsable output needs new unit tests. I update the old tests with fresh
data from one of my test systems and create new tests for the same data
but with the parsable output flag set. These tests also test the new
code that converts numbers to actually numeric values.
2017-12-02 13:09:38 +01:00
twangboy
371e210247
Add ability to reset file system object perms
2017-12-01 16:51:18 -07:00
twangboy
a5737e8fc3
Fix lint errors
2017-12-01 16:45:18 -07:00
twangboy
be96de09cc
Fix pickling error by decorating
2017-12-01 16:45:18 -07:00
rallytime
3d9eafc4bd
Lint: Remove extra empty lines at end of files
2017-12-01 14:46:27 -05:00
twangboy
5615862f23
Fix some lint
2017-12-01 10:25:48 -07:00
twangboy
627d5ab0c9
Mock salt.utils.which
...
cmd.run return values are mocked
2017-12-01 10:25:48 -07:00
twangboy
e5a96fe00f
Skip test_fstype on Windows
...
no lsblk on Windows
2017-12-01 10:25:48 -07:00
rallytime
239f3511bf
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/modules/reg.py
- salt/modules/state.py
- salt/modules/win_pkg.py
- salt/netapi/rest_cherrypy/app.py
- salt/utils/__init__.py
- tests/integration/modules/test_file.py
- tests/integration/output/test_output.py
- tests/unit/grains/test_core.py
2017-12-01 11:12:44 -05:00
Nicole Thomas
d23192c492
Merge pull request #44747 from gtmanfred/roster_defaults
...
use a copy so roster_defaults doesn't mangle
2017-12-01 10:13:47 -05:00
Agnes Tevesz
42fcaf6c05
Fixed esxvm module, schema, proxy, states and vmware utils, vsphere
...
module pr-pylint issues
2017-12-01 11:23:38 +01:00
Agnes Tevesz
a517550bc3
Added to tests.modules.test_vsphere the esxvm compatibility for tests
2017-12-01 11:23:27 +01:00
Agnes Tevesz
c1b430ca65
Added tests: unit.utils.vmware.test_vm, covers:
...
- vm creation
- vm registation
2017-12-01 11:22:57 +01:00
Agnes Tevesz
c3c15a2b92
Adding vmware utils changes for virtual machine management, tests are
...
included
2017-12-01 11:22:43 +01:00
Bo Maryniuk
e1eec2c69d
Add unit test for __virtual__ in case Ansible is installed on the Minion
2017-12-01 11:21:27 +01:00
Bo Maryniuk
fa21af69dd
Add unit test for __virtual__ in case Ansible is not installed on the Minion
2017-12-01 11:21:27 +01:00
Nicole Thomas
5c737100c4
Merge pull request #44726 from terminalmage/issue42188
...
Add __context__ to RunnerClient and WheelClient
2017-11-30 19:03:02 -05:00
Daniel Wallace
911411ed8f
add unit test
2017-11-30 13:48:30 -07:00
Erik Johnson
c1e4bea83e
Change lock message
2017-11-30 14:30:44 -06:00
Erik Johnson
3770cd7dd3
Add unit test for lock_saltenv
...
Also move up the _get_opts in state.pkg to make it easier to unit test
2017-11-30 14:28:09 -06:00
Erik Johnson
683e2cc502
Rename 'environment' config option to 'saltenv'
...
'environment' predates the 'saltenv' nomenclature, and since we have
been using saltenv on the CLI for years, and now also have pillarenv, it
makes sense to make this change.
2017-11-30 13:08:49 -06:00
rallytime
dc3097cedd
Write a unittest for error message raised with missing "." in function
2017-11-30 11:05:22 -05:00
Denys Havrysh
d1f247e49e
Add basic unit tests for schedule util eval func
2017-11-30 12:43:52 +02:00
Erik Johnson
74a18f387f
Update orchestration unit tests
2017-11-29 15:51:53 -06:00
twangboy
4e0359b603
Skip IPC transport tests in Windows, not supported
2017-11-29 09:19:51 -07:00
Georges Racinet
fb586c6dce
Backported issue #42713 to 2017.7
...
Cherry-picked and squashed the two commits from the develop branch
(details at the end of this message)
The unit test module didn't exist at all on 2017.7, hence a conflict during
cherry picking, resolved by introducing only the new tests (the other ones
don't pass as is on 2017.7)
Also, the mock in unit tests for mine.get had to be adapted,
because the return of salt.utils.minions.CkMinions._check_compound_minions()
takes a different form on 2017.7 (just the list of minions).
Original cherry-picked commits:
commit 115ebef6a089dedf8dbadd3b4cca768adbb4a710
Author: Georges Racinet <gracinet@anybox.fr>
Date: Wed Nov 8 18:02:29 2017 +0100
Unit test for backwards compatibility of mine.get
Could not find calls to RemoteFuncs in unit tests, therefore started a
new one, hope it's in the appropriate place.
The test replaces the caceh by its own (very limited) one. It's quite
possible it could be improved by reusing another one meant for unit tests.
commit dc884478399355f3fbea8626a8366b933580dee0
Author: Georges Racinet <gracinet@anybox.fr>
Date: Mon Oct 30 13:49:13 2017 +0100
Backwards compat for mine.get on pre-Nitrogen minions
With this change, the master will accept `expr_form` from
its minions doing a `mine.get`, which is what minions versions
before Nitrogen would do. This solves issue #42713 .
In case both `tgt_type` and `expr_form` are present, the former
gets precedence.
Performance-wise, this adds a single dict lookup for minions
running Nitrogen onwards, and two for pre-Nitrogen minions.
This is, in my opinion, acceptable.
2017-11-29 16:17:52 +01:00
Nicole Thomas
1855f3fe12
Merge pull request #43783 from garethgreenaway/43647_fix_InitiatorName_in_comments
...
[develop] Fix to grains/core.py
2017-11-29 09:05:59 -05:00
Gareth J. Greenaway
89b546c075
Merge branch 'develop' into netbox-module
2017-11-28 15:25:42 -08:00
Gareth J. Greenaway
6ee18e4f38
Merge branch 'develop' into 43647_fix_InitiatorName_in_comments
2017-11-28 13:35:11 -08:00
Anthony Shaw
a029f70cff
merge inbound, resolve conflict and remove unfinished state test module
2017-11-29 08:21:53 +11:00
Nicole Thomas
5bc454821b
Merge branch 'develop' into fixpip
2017-11-28 16:00:51 -05:00
Nicole Thomas
a5828d6ad9
Merge branch 'develop' into 43647_fix_InitiatorName_in_comments
2017-11-28 09:17:34 -05:00
Erik Johnson
682fc1b884
Fix failing grains test on CentOS
...
Resolves https://github.com/saltstack/salt-jenkins/issues/556
2017-11-27 21:37:46 -06:00
Zach Moody
1faa685d9e
fixup pylint import error.
2017-11-27 19:05:51 -06:00
Zach Moody
871a90cbc5
add netbox execution module
2017-11-27 18:59:06 -06:00
Christian McHugh
249987f750
merge with develop
2017-11-27 22:04:59 +00:00
Nicole Thomas
7adc0b5b6f
Merge pull request #43893 from olivier-mauras/saltclass
...
SaltClass: Correct when dict is NoneType because of the value doesn't exist
2017-11-27 16:24:25 -05:00
Nicole Thomas
94001ffc64
lint: whitespace fixes
2017-11-27 16:15:44 -05:00
Nicole Thomas
e8298d734d
Merge branch 'develop' into 43647_fix_InitiatorName_in_comments
2017-11-27 15:08:36 -05:00
Nicole Thomas
cae5309752
Merge pull request #44646 from mchugh19/pip-is_installed
...
add is_installed function
2017-11-27 14:40:55 -05:00
Erik Johnson
8ee5e57fee
Merge pull request #44649 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-11-27 11:23:29 -06:00
Nicole Thomas
9e45e4eff9
Lint: Remove extra blank lines
2017-11-27 11:25:05 -05:00
Anthony Shaw
b95750e31c
fix minor linting errors
2017-11-25 19:04:57 +11:00
Anthony Shaw
febee3e065
patch cache replacement
2017-11-25 19:02:02 +11:00
Anthony Shaw
8ac1144c77
complete tests for grain module
2017-11-25 06:11:25 +11:00
Anthony Shaw
0a34c12147
tests for napalm grains module, still issue to resolve on is_proxy
2017-11-25 05:47:27 +11:00
Anthony Shaw
efcc0098f2
add unit tests for the proxy module
2017-11-25 05:06:41 +11:00
Anthony Shaw
8fd459af74
complete tests for napalm_yang_mod
2017-11-25 04:06:36 +11:00
Anthony Shaw
92ef7c555b
test for napalm_yang_mod
2017-11-25 03:48:22 +11:00
Anthony Shaw
7376d631f5
add napalm_users tests
2017-11-24 17:13:59 +01:00
Anthony Shaw
8da1aafb00
add napalm_snmp tests
2017-11-24 17:13:44 +01:00
Anthony Shaw
a8c3f1bd35
add napalm_route tests
2017-11-24 17:13:30 +01:00
Anthony Shaw
c7106d646c
complete tests for napalm_probes
2017-11-24 16:48:06 +01:00
Anthony Shaw
136816c109
fix missing commas in docstrings
2017-11-24 16:36:38 +01:00
Anthony Shaw
dd682106cd
add module for testing napalm_probes
2017-11-24 16:34:40 +01:00
Anthony Shaw
452a8965a3
complete coverage for NTP module
2017-11-24 16:34:16 +01:00
Christian McHugh
590834a136
Use json format with newer pip versions (> 9)
...
Add unit tests for both pip > 9 and legacy
2017-11-23 22:27:23 +00:00
Jorge Schrauwen
a94edecc93
Merge branch 'develop' into zpoolupdate
2017-11-23 16:53:41 +01:00
Christian McHugh
ab5520fdf7
add true and false test for is_installed
2017-11-23 14:08:46 +00:00
