Ahmed AbouZaid
4057256728
pep8 complaint
2017-12-09 01:06:39 +01:00
Nicole Thomas
2a2fad5037
Merge pull request #44818 from Ch3LL/test_true_minion
...
Allow test arg to be used on master or pillar
2017-12-08 17:36:25 -05:00
Nicole Thomas
f5a143f8c5
Merge pull request #44621 from isbm/isbm-bsc1068446-2017.7
...
Bugfix: errors in external pillar causes crash, instead of report of them
2017-12-08 13:46:55 -05:00
Gareth J. Greenaway
4314d777e0
Merge pull request #44656 from gracinet/44606_glusterfs_peered_self_detection
...
Take IPv6 into account in states.glusterfs.peered
2017-12-08 10:43:02 -08:00
Gareth J. Greenaway
126bc217b5
Merge branch 'develop' into 44606_glusterfs_peered_self_detection
2017-12-08 09:36:19 -08:00
Gareth J. Greenaway
a380561180
Merge branch 'develop' into issue30842
2017-12-08 09:32:39 -08:00
Nicole Thomas
95d9eb5744
Merge pull request #44324 from benediktwerner/accept-minions-from-grains
...
Automatically accept minion keys based on grains
2017-12-08 09:02:01 -05:00
Mircea Ulinic
f6112fa89e
Add testcases for the nested outputter
2017-12-08 11:11:05 +00:00
rallytime
23c5a4ca3e
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/modules/win_pkg.py
- salt/states/file.py
- tests/integration/states/test_file.py
- tests/unit/states/test_file.py
2017-12-07 17:33:03 -05:00
Ch3LL
6a379195bc
Add test to ensure log files are created
2017-12-07 17:31:26 -05:00
Gareth J. Greenaway
01dc34cf91
Merge branch 'develop' into 44606_glusterfs_peered_self_detection
2017-12-07 13:43:11 -08:00
Nicole Thomas
5b579459a8
Merge pull request #44796 from sjorge/issue44404
...
Fix for Issue #44404
2017-12-07 16:42:11 -05:00
Nicole Thomas
abe089ad54
Merge pull request #43379 from twangboy/win_fix_file.managed
...
Fix file.managed on Windows with test=True
2017-12-07 16:10:42 -05:00
Nicole Thomas
53eee476ac
Merge pull request #44638 from terminalmage/new-docker-hotness
...
Many improvements to docker network and container states
2017-12-07 15:50:55 -05:00
Gareth J. Greenaway
13dd5c3095
Merge branch 'develop' into issue30842
2017-12-07 12:46:15 -08:00
Nicole Thomas
15d9a8d3e0
Merge pull request #44644 from mchugh19/fixpip
...
Correct pip parsing
2017-12-07 15:44:13 -05:00
Gareth J. Greenaway
cd7ff5e611
Merge branch 'develop' into sentry_return
2017-12-07 12:01:05 -08:00
Ahmed AbouZaid
3e96abaa8d
Merge branch 'develop' of https://github.com/saltstack/salt into defaults_merge_enhancements
2017-12-07 20:28:55 +01:00
Gareth J. Greenaway
edcd581ca5
Merge branch '2017.7' into win_fix_file.managed
2017-12-07 10:00:55 -08:00
Nicole Thomas
b6173d6ada
Merge pull request #44851 from AAbouZaid/defaults_deepcopy
...
Add defaults.deepcopy function.
2017-12-07 11:02:53 -05:00
Nicole Thomas
2458e18f47
Merge branch 'develop' into fixpip
2017-12-07 10:56:58 -05:00
Nicole Thomas
2a38063ef0
Merge pull request #44558 from pjcreath/add_file_tree_environments
...
salt.pillar.file_tree: add support for environments, add test
2017-12-07 10:56:27 -05:00
Daniel Wallace
3f1268d67f
fix patching for python 2.6
2017-12-07 08:25:26 -07:00
Nicole Thomas
3b57e306db
Merge branch 'develop' into test_true_minion
2017-12-07 10:23:06 -05:00
Nicole Thomas
7adcfbf8ec
Merge branch '2017.7' into develop2
2017-12-07 10:14:52 -05:00
Tom Williams
c03112dbb0
Merge branch 'develop' into infra5980
2017-12-06 14:48:03 -05:00
Tom Williams
93de11063a
INFRA-5743 - carriage return...
2017-12-06 14:47:07 -05:00
Jorge Schrauwen
40f3a6f053
Merge branch 'develop' into issue44404
2017-12-06 20:25:14 +01:00
Erik Johnson
4908cf74e0
More conversion to __utils__
...
Also, actually using __utils__ here revealed several import errors in
utils modules, so these needed to be dealt with.
2017-12-06 13:14:02 -06:00
Erik Johnson
64aa4fbbec
Many improvements to docker network and container states
...
Much Improved Support for Docker Networking
===========================================
The `docker_network.present` state has undergone a full rewrite, which
includes the following improvements:
Full API Support for Network Management
---------------------------------------
The improvements made to input handling in the
`docker_container.running` state for 2017.7.0 have now been expanded to
docker_network.present`. This brings with it full support for all
tunable configuration arguments.
Custom Subnets
--------------
Custom subnets can now be configured. Both IPv4 and mixed IPv4/IPv6
networks are supported.
Network Configuration in :py:func:`docker_container.running` States
-------------------------------------------------------------------
It is now possible to configure static IPv4/IPv6 addresses, as well as
links and labels.
Improved Handling of Images from Custom Registries
==================================================
Rather than attempting to parse the tag from the passed image name, Salt
will now resolve that tag down to an image ID and use that ID instead.
Due to this change, there are some backward-incompatible changes to
image management. See below for a full list of these changes.
Backward-incompatible Changes to Docker Image Management
--------------------------------------------------------
Passing image names to the following functions must now be done using separate
`repository` and `tag` arguments:
- `docker.build`
- `docker.commit`
- `docker.import`
- `docker.load`
- `docker.tag`
- `docker.sls_build`
Additionally, the `tag` argument must now be explicitly passed to the
`docker_image.present` state, unless the image is being pulled from a
docker registry.
2017-12-06 12:12:25 -06:00
Nicole Thomas
f7a0979449
Merge pull request #43969 from fishhead108/add-cloud.vmware.remove_snapshot-feature
...
Remove snapshot by name feature
2017-12-06 13:08:14 -05:00
Ahmed AbouZaid
aa9e505588
write unit test for defaults.merge not in place
2017-12-06 18:30:50 +01:00
Jorge Schrauwen
6324339fc6
Merge branch 'develop' into issue44404
2017-12-06 17:23:21 +01:00
Daniel Wallace
bfda932140
Remove irrelevant test
...
This test was used to make sure that our __query_node_data function correctly
queried the information about the server before we attempted to bootstrap it.
With shade, that function is no longer needed, because shade will query the
server and return back when the server is ready when `wait=True` is set. This
is set for all server builds.
2017-12-06 09:09:34 -07:00
Daniel Wallace
67320d3012
fix pylint
2017-12-06 09:07:35 -07:00
Ahmed AbouZaid
2c51005810
write unit test for defaults.deepcopy
2017-12-06 16:57:55 +01:00
Ahmed AbouZaid
6af5cd844f
write unit test for defaults.merge
2017-12-06 15:43:30 +01:00
Nicole Thomas
d20b3e458a
Merge branch 'develop' into issue30842
2017-12-06 09:28:06 -05:00
Anthony Shaw
6231d69f85
Merge remote-tracking branch 'origin/develop' into more_napalm_tests
2017-12-06 15:12:35 +11:00
Nicole Thomas
45573a1fdf
Merge pull request #44627 from mstagi/add-vmware-vm-management
...
Add vmware vm management
2017-12-05 18:07:03 -05:00
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
Daniel Wallace
1d0bd5bb32
Merge branch '2016.11' into 2016.11
2017-12-04 10:13:15 -07: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
Erik Johnson
b4eb1527a6
Add test for PR 44335
...
This also modifies the virtual_subtype code slightly, due to an issue I
noticed in testing. We were reading from `/proc/1/cgroup` twice (once
for LXC, and then again for Docker).
2017-11-25 14:32:43 -06: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
Ahmed AbouZaid
ff7e0292c4
add test for toml serializer
2017-11-23 00:44:55 +01:00
Georges Racinet
ebc165be45
Improving pylint score on states.glusterfs and test
...
the only tricky one is the shadowing of `peered` (function and local variable),
but that variable wasn't really needed.
I don't know why I get no-member errors for __salt__ and __opts__ in the
test file (read .pylintrc very quickly only).
The states modules is up to 10.0 score for me with that change
2017-11-22 21:15:34 +01:00
Georges Racinet
451fddb084
Take IPv6 into account in states.glusterfs.peered
...
This solves issue #44606
Resolution of the peer IP address (done to check if it is the current
minion) should not fail and return IPv6 addresses as well as IPv4.
The refactor uses functions from salt.utils.network instead of directly
calling socket.gethostbyname(), because they are already presented in
an easy to use format.
2017-11-22 20:58:54 +01:00
rallytime
1dea504f2d
Replace util path references with new ones
2017-11-22 12:44:36 -05:00
rallytime
052b13c98e
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/cli/daemons.py
- salt/client/ssh/__init__.py
- salt/modules/win_pkg.py
- salt/netapi/rest_cherrypy/app.py
- salt/proxy/fx2.py
- salt/utils/__init__.py
- salt/utils/jinja.py
- salt/utils/napalm.py
- salt/utils/path.py
- salt/utils/verify.py
- tests/integration/modules/test_saltutil.py
- tests/integration/states/test_service.py
- tests/unit/utils/test_verify.py
2017-11-22 12:36:03 -05:00
Nicole Thomas
6d861f9a74
Disable pylint warning
2017-11-22 10:36:21 -05:00
rrroo
e3897e4820
Use assertEqual
2017-11-22 16:35:38 +01:00
Mircea Ulinic
3a0945ce3d
Merge pull request #11 from tonybaloney/gh_44332_clone
...
Thanks @tonybaloney
2017-11-22 10:41:01 +00:00
Anthony Shaw
dfdb43780d
coverage for ntp testing
2017-11-22 11:36:22 +01:00
Anthony Shaw
5ce67c8a7b
setup all tests for napalm_acl module
2017-11-22 09:01:26 +00:00
Anthony Shaw
40431228c8
Add test module for napalm_acl
2017-11-22 08:41:39 +00:00
Anthony Shaw
cd8d87c61f
create a common module for napalm tests, setup napalm_bgp tests
2017-11-22 08:37:56 +00:00
Anthony Shaw
88ef9f18fc
ignore lint error on import
2017-11-22 08:11:07 +00:00
Anthony Shaw
25427d845e
convert key iterator to list as python 3 wont index an iterator
2017-11-22 08:10:36 +00:00
Gareth J. Greenaway
227be73e0a
Merge branch 'develop' into 43647_fix_InitiatorName_in_comments
2017-11-20 11:01:38 -08:00
Nicole Thomas
bce50154e5
Merge branch '2017.7' into improve-net-load
2017-11-20 10:59:54 -05:00
Roald Nefs
ac1a4d0817
Updated Telegram returner test
...
- Removed trailing newlines
2017-11-20 10:41:08 +01:00
Benedikt Werner
57b5510577
Merge branch 'develop' into accept-minions-from-grains
2017-11-20 10:19:22 +01:00
Roald Nefs
47147e2769
Added new Telegram module
...
Added a new Telegram module, which allows to send a message via Telegram
using the Telegram Bot API. The commit also includes:
- Update for the Telegram returner (merged in #44148 ); the Telegram
returner now fully utilizes the Telegram module.
- Update to the documentation in order to add the Telegram module to the
list list of all modules.
- Updated Telegram returner test.
- New Telegram module test.
2017-11-20 08:47:57 +01:00
Jorge Schrauwen
409acc1b1b
Also add tests for zpool.scrub
2017-11-19 12:16:29 +01:00
Jorge Schrauwen
64e0b45e51
Add tests for zpool.labelclear and zpool.split
2017-11-19 12:09:36 +01:00
Anita Krueger
d3c4f6026b
Adding nexus state and module including unit tests
2017-11-18 15:31:37 +00:00
Benedikt Werner
6900e6ece1
Merge branch 'develop' into accept-minions-from-grains
2017-11-17 19:35:53 +01:00
Nicole Thomas
24b1d7af31
Merge pull request #44518 from twangboy/win_fix_verify_env
...
Pass root_dir to the win_verify_env function
2017-11-16 15:57:48 -05:00
Nicole Thomas
be930beee6
Merge branch 'develop' into add-cloud.vmware.convert_to_snapshot-feature
2017-11-16 11:26:25 -05:00
pjcreath
4ad01ba739
Fix file_tree py3 incompatibility and update test
...
The incompatibility was introduced in 2015.8.4, but there wasn't any
test case to catch it.
2017-11-16 10:16:28 -05:00
Nicole Thomas
d622877558
Merge branch 'develop' into sentry_return
2017-11-16 10:07:47 -05:00
Nicole Thomas
3275dbeff9
Merge branch 'develop' into add-cloud.vmware.remove_snapshot-feature
2017-11-16 09:59:29 -05:00
fishhead108
8a681751fe
change call type
2017-11-16 00:07:03 +01:00
fishhead108
fc17d47bcf
add test_remove_snapshot_call_no_snapshot_name_in_kwargs
2017-11-16 00:05:22 +01:00
fishhead108
35f3c96ade
Test for convert_to_template_call
2017-11-15 22:26:42 +01:00
fishhead108
e8d1cd44ea
Test for remove_snapshot_call
2017-11-15 22:21:12 +01:00
pjcreath
89a198fe98
salt.pillar.file_tree: add support for environments, add test
...
This modifies this ext_pillar with basic support for environments
by treating a relative root_dir as relative to the pillar_roots
of the environment specified by pillarenv.
The behavior for absolute paths is unchanged.
Also adds a unit test for file_tree testing both old and new
behavior.
Resolves #44458 .
2017-11-15 13:28:14 -05:00
rrroo
f10d04c8af
Add unittest for sentry_return
...
Move functions to top level to improve testability.
2017-11-15 16:06:56 +01:00
Nicole Thomas
4315c20195
Merge branch 'develop' into add-mandrill-mod
2017-11-14 17:29:52 -05:00
Nicole Thomas
2c6f8f5f9e
Merge pull request #44510 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-11-14 17:21:13 -05:00
Erik Johnson
958e1aeb8d
Fix test to reflect changes in YAML dumper
...
PR #42064 modified the YAML dumper to display unicode text as a unicode
literal rather than with the !!python/unicode extension prefix. This
updates the test to reflect the change in Salt's behavior.
2017-11-14 13:43:39 -06:00
Ch3LL
9ea4db4224
mock socket.getaddrinfo
2017-11-14 14:39:15 -05:00
Tom Williams
cedd0db97a
INFRA-5980 - fix unit test
2017-11-14 11:51:16 -05:00
Ch3LL
78a07e30f4
add more fqdn tests and remove some of the mocking
2017-11-14 11:39:35 -05:00
Ch3LL
5dbf4144ce
add ipv6 in opts
2017-11-14 11:39:35 -05:00
Ch3LL
eabc1b4f9c
Add fqdn and dns core grain tests
2017-11-14 11:39:31 -05:00
Mircea Ulinic
777d01e82a
Add tests for the mandrill execution module
2017-11-14 11:26:56 +00:00
Mircea Ulinic
ba4a62769c
Fix trailing spaces
2017-11-14 09:21:55 +00:00
Nicole Thomas
a5bb896ff1
Merge pull request #44340 from gracinet/42713_mine.get_back_compat
...
Backwards compat for mine.get on pre-Nitrogen minions
2017-11-13 16:49:51 -05:00
twangboy
47114fdb30
Pass root_dirs to the win_verify_env function
...
Remove while loop that was hanging when `salt` wasn't in the path
Add salt.util.path.safe_path function to check for unsafe paths
Pass root_dir to all calls to `verify_env`
2017-11-13 13:05:23 -07:00
Erik Johnson
df972db3ba
Merge pull request #42930 from CorvinM/issue36942
...
Jinja line statements and comments
2017-11-13 12:02:16 -08:00
Mike Place
97863f338a
Merge pull request #43410 from skob/develop
...
queue.insert_runner with sqlite backend
2017-11-13 12:47:32 -07:00
Mike Place
28e1160c41
Merge pull request #43474 from kstreee/separate-key-dir-from-cache-dir
...
Separates 'key_dir' from 'cache_dir', The key files (i.e. '.root_key', '.sudo_ACCOUNT_NAME') must not be shared with other masters.
2017-11-13 12:41:28 -07:00
Mike Place
3af0031e02
Merge pull request #43504 from isbm/isbm-ansible-module-dev
...
Got Ansible own modules? Run them from within the Salt just like that!
2017-11-13 12:28:25 -07:00
Mike Place
79b7eb1c33
Merge branch 'develop' into 43647_fix_InitiatorName_in_comments
2017-11-13 12:20:39 -07:00
Mike Place
f9b273a894
Merge pull request #43837 from twangboy/win_unit_test_archive
...
Fix `unit.states.test_archive` for Windows
2017-11-13 12:12:18 -07:00
Olivier Mauras
61f30a9d80
Correct when dict is NoneType because of the value doesn't exist
...
Example:
``` yaml
pillars:
default:
commands:
{% if grains['os'] == 'RedHat' %}
pkg_grains: /usr/bin/rpm_grains
{% endif %}
```
In this case `pkg_grains` wouldn't be found on anything else that RedHat systems and would be NoneType which would return an error and break the module.
2017-11-13 19:49:25 +01:00
Mike Place
dd2844a645
Merge pull request #44196 from benediktwerner/develop
...
Fix autosign file permission check [develop]
2017-11-13 11:34:37 -07:00
Mike Place
f2aa3539ef
Merge branch 'develop' into accept-minions-from-grains
2017-11-13 11:13:50 -07:00
Mike Place
fef389d6ea
Merge branch 'develop' into 42713_mine.get_back_compat
2017-11-13 11:07:35 -07:00
Mike Place
ebbe5949ea
Merge pull request #44457 from twangboy/win_remove_wmi_monkeypatching
...
Remove wmi monkeypatching
2017-11-13 10:38:51 -07:00
rallytime
59ddde4671
Update old util paths to new paths
2017-11-13 12:35:31 -05:00
Gareth J. Greenaway
4d0806e28c
Merge branch '2017.7' into develop2
2017-11-13 10:29:46 -07:00
rallytime
4e2280157a
Merge branch '2017.7' into 'develop'
...
Conflicts:
- .kitchen.yml
- tests/unit/test_doc.py
- tests/unit/utils/test_cloud.py
2017-11-13 12:27:59 -05:00
Anthony Shaw
ba0280e727
linting updates
2017-11-11 15:25:36 +02:00
Anthony Shaw
78b90f3d0c
add remaining tests
2017-11-11 15:21:24 +02:00
Anthony Shaw
386c4e5791
add tests for all the getters
2017-11-11 14:55:25 +02:00
Mike Place
bca50dedb0
Merge pull request #44361 from isbm/isbm-file.line-issues-devel
...
Long-awaiting set of unit tests and fixes for "file.line"
2017-11-10 16:37:56 -07:00
Sergey Kizunov
4d0d023115
Fix broken beacons_before_connect feature
...
The `beacons_before_connect` and `scheduler_before_connect` features
that came from PR #38289 had code that was lost and so the features
don't work. Added them back in and also added unit tests to help
prevent this type of issue in the future.
Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2017-11-10 16:26:04 -06:00
twangboy
2f30ad93b1
Skips mode check in Windows
2017-11-10 14:29:10 -07:00
Mike Place
8391b34372
Merge pull request #44148 from roaldnefs/add-telegram-returner
...
Add Telegram returner
2017-11-10 12:04:30 -07:00
Bo Maryniuk
f8c016cd48
Remove extra assertions
2017-11-10 20:02:04 +01:00
Bo Maryniuk
755bc35585
Fix value is not iterable error
2017-11-10 20:02:04 +01:00
Bo Maryniuk
56c52e6ab3
Fix TypeError for argument of type 'LoaderError' is not iterable
2017-11-10 20:02:04 +01:00
Bo Maryniuk
8f7ef4f45f
Lintfix: E9502
2017-11-10 20:02:04 +01:00
Bo Maryniuk
0594517a2e
Lintfix: E0102
2017-11-10 20:02:04 +01:00
Bo Maryniuk
7742037bcd
Don't bother with non-pytest unit tests
2017-11-10 20:02:04 +01:00
Bo Maryniuk
67cede713f
Add unit test for module loader failure
2017-11-10 20:02:04 +01:00
Bo Maryniuk
4004e2f53d
Add unit test for module loader
2017-11-10 20:02:04 +01:00
Bo Maryniuk
fd2fca0482
Improve module loader failure
2017-11-10 20:02:04 +01:00
Bo Maryniuk
25990f66bc
Add unit test resolver module loader failure
2017-11-10 20:02:04 +01:00
Bo Maryniuk
9d0762a8ee
Refactor to setup/teardown methods
2017-11-10 20:02:04 +01:00
Bo Maryniuk
630b654544
Add unit test for modules filtering
2017-11-10 20:02:04 +01:00
Bo Maryniuk
fc24371704
Do not use mock but real resolver class
2017-11-10 20:02:04 +01:00
Bo Maryniuk
082d47f2c1
Add unit test for documentation extractor
2017-11-10 20:02:04 +01:00
Bo Maryniuk
c7a1b733ab
Add scaffold for the unit test
2017-11-10 20:02:04 +01:00
Bo Maryniuk
b2ed7d0ecd
Mute pylint on misdetected regex-like strings that are actually just test data.
2017-11-10 19:50:47 +01:00
Bo Maryniuk
40f1e1d954
Rewrite unit tests for file.line on delete/replace an empty line
2017-11-10 19:50:47 +01:00
Bo Maryniuk
c2d9d8f8ea
Add unit test for file.line ensuring line between two lines but content already exists
2017-11-10 19:50:47 +01:00
Bo Maryniuk
9963895719
Add unit test for file.line ensuring line inside the range of lines
2017-11-10 19:50:47 +01:00
Bo Maryniuk
1e1f5e5a6f
Add unit test for file.line ensuring line between two other lines nearby
2017-11-10 19:50:47 +01:00
Bo Maryniuk
59de17b260
Add unit test for file.line on calling insert/ensure after specific line
2017-11-10 19:50:47 +01:00
Bo Maryniuk
710481b25e
Add unit test for file.line when calling insert/ensure mode
2017-11-10 19:50:47 +01:00
Bo Maryniuk
b42b762c57
Add unit test for file.line when inserting a line at the end of the file (append functionality)
2017-11-10 19:50:46 +01:00
Bo Maryniuk
80c40bbb11
Remove irrelevant issue number
2017-11-10 19:50:46 +01:00
Bo Maryniuk
c95b3e031c
Add unit test about file.line for insert/start
2017-11-10 19:50:46 +01:00
Bo Maryniuk
926372574d
Remove irrelevant issue number from the docstring
2017-11-10 19:50:46 +01:00
Bo Maryniuk
b4cd4bd165
Add unit test for file.line replacement
2017-11-10 19:50:46 +01:00
Bo Maryniuk
9a72761dc6
Add unit test for file.line delete by direct match or regular expression
2017-11-10 19:50:46 +01:00
Bo Maryniuk
60185f578e
Add unit test for file.line usage together with before/after
2017-11-10 19:50:46 +01:00
Bo Maryniuk
fc79a546dd
Rename unit test
2017-11-10 19:50:46 +01:00
Bo Maryniuk
d1a41dd7bd
Add unit test file.line insert before line
2017-11-10 19:50:46 +01:00
Bo Maryniuk
1ea7e33605
Harden unit test for 'after pattern' scenario
2017-11-10 19:50:46 +01:00
Bo Maryniuk
bde3611f08
Remove unnecessary code
2017-11-10 19:50:46 +01:00
Bo Maryniuk
fdffbe47b0
Add unit test for using patterns for line matching
2017-11-10 19:50:46 +01:00
Bo Maryniuk
ed171176a8
Rename unit test while using no patterns
2017-11-10 19:50:46 +01:00
Bo Maryniuk
d08307f53b
Add unit test for file.line insert=after
2017-11-10 19:50:46 +01:00
Bo Maryniuk
39126da5a2
Update unit test data
2017-11-10 19:50:46 +01:00
Bo Maryniuk
47fbe03c14
Add unit test for file._starts_till function
2017-11-10 19:50:46 +01:00
Bo Maryniuk
599310e684
Fix docs for skipif decorator
2017-11-10 19:50:46 +01:00
Bo Maryniuk
d5d653af45
Add unit test for file.line on no location/before/after check failure
2017-11-10 19:50:46 +01:00
Bo Maryniuk
5b76c41f44
Move all file.line unit tests to the own class
2017-11-10 19:50:46 +01:00
