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
1beb646a04
Handle the fact that attachable is unmanageable on Cent7
2017-12-06 12:12:26 -06:00
Erik Johnson
2eb58e6a5b
Remove use of auto_remove in docker_container integration tests
...
CentOS 7 still ships a version of Docker with API version 1.24 which
does not support this argument. This commit uses `docker.rm` to remove
the container manually after the state is run, in cases where we were
using auto_remove=True.
2017-12-06 12:12:26 -06:00
Erik Johnson
84c38c09ca
Add integration tests for docker_container.run state
2017-12-06 12:12:26 -06:00
Erik Johnson
ce13d8f2e6
Update busybox image script to include /etc/{passwd,group,shadow}
...
These are necessary to make sure users work
2017-12-06 12:12:25 -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
Nicole Thomas
904c0da893
Merge branch '2017.7' into status
2017-12-06 12:51:52 -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
019169ed61
Merge pull request #44824 from Ch3LL/spm_args
...
Add spm -y and -f arg integration tests
2017-12-05 16:49:31 -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
Nicole Thomas
b946ad3384
Merge pull request #43710 from amendlik/gpg-yaml-sdb
...
Add GPG support to YAML SDB module
2017-12-05 14:42:41 -05:00
Ch3LL
d8f81d2e4d
fix pylint
2017-12-05 14:39:36 -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
Nicole Thomas
59b930668c
Merge pull request #44742 from Ch3LL/cloud_action_test
...
Add salt-cloud action rename integration test
2017-12-05 12:44:49 -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
Erik Johnson
ee3486a671
Include failed state/function orchestration results in changes dict
...
Before this commit they would be in the comment, making it difficult to
programatically analyze the failures.
2017-12-05 00:56:05 -06: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
Ch3LL
951d09ca2f
remove unnecessary try/except block
2017-12-04 16:18:01 -05:00
Ch3LL
c329ced7ee
Add salt-cloud action rename integration test
2017-12-04 16:16:08 -05:00
Nicole Thomas
0697ed0645
Merge branch 'develop' into accept-minions-from-grains
2017-12-04 16:10:32 -05:00
Ch3LL
61ac5cf157
Add spm -y and -f arg integration tests
2017-12-04 16:06:14 -05:00
twangboy
a27bb6993a
Fix py3 error
2017-12-04 14:05:54 -07:00
twangboy
0ff9fa498a
Fix test_directory
2017-12-04 14:05:54 -07:00
twangboy
187bc1e61e
Add back the try/finally blocks
2017-12-04 14:05:54 -07:00
twangboy
d7241d004f
Fix 2 more tests
2017-12-04 14:05:54 -07:00
twangboy
d5dd42aebe
Fix integration tests for Windows
2017-12-04 14:05:53 -07:00
twangboy
af5565859e
Use file functions for symlink and remove
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
twangboy
068e463870
Fix lint, add integration tests
2017-12-04 13:29:37 -07: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
bbf542d5d1
pylint fixes
2017-12-04 15:38:23 +01:00
Michael Calmer
b6365aee3c
fix order of parameters in unit tests
2017-12-04 15:38:22 +01:00
Michael Calmer
3d04f7d1fe
test package capability feature
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
Thomas S Hatch
887336c6de
Merge pull request #44691 from isbm/isbm-ansiblegate-issue44670
...
Bugfix: ansiblegate, issue 44670
2017-12-01 16:11:52 -07:00
rallytime
3d9eafc4bd
Lint: Remove extra empty lines at end of files
2017-12-01 14:46:27 -05:00
rallytime
817ac002b0
Add destructive test decorator to test class
...
Because the destructive test decorator was applied to the tearDown
function, the tests show a stacktrace instead of a nice skip message
when running without the `--run-destructive` flag. By applying the
decorator to the test class (since all tests are destructive anyway)
we can keep the output clean and still skip tests appropriately.
2017-12-01 14:33:38 -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
Nicole Thomas
5b3da7dbb3
Merge pull request #44762 from cloudflare/sync-thorium
...
Add saltutil.sync_thorium execution and runner functions
2017-12-01 09:21:19 -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
Mircea Ulinic
dce017b3f7
Make tests happy
2017-11-30 15:50:11 +00:00
Nicole Thomas
06fb80b69c
Merge pull request #44640 from vutny/fix-cron-schedule-splay
...
Fix #44583 : splay with cron-like scheduled jobs
2017-11-30 10:30:40 -05:00
Nicole Thomas
e5a1401b82
Merge pull request #44712 from Ch3LL/ssh_pillar_items
...
Add pillar ssh integration tests
2017-11-30 10:29:32 -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
Nicole Thomas
7bde48282e
Merge pull request #44737 from twangboy/win_skip_test_ipc
...
Skip `unit.transport.test_ipc` for Windows
2017-11-29 14:18:20 -05:00
Georges Racinet
6806d83314
Merge branch '2017.7' into 42713_backport_2017.7
2017-11-29 19:00:38 +01: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
Ch3LL
9b7421b261
Change check to the state id
2017-11-29 10:15:56 -05:00
Ch3LL
9cc853e3d5
Add masterless state.highstate integration test
2017-11-29 10:15:56 -05:00
Nicole Thomas
2dc3e5c42a
Merge pull request #44613 from Ch3LL/pillar_masterless
...
Add pillar.items test for masterless
2017-11-29 09:43:10 -05:00
Nicole Thomas
cc05481026
Merge pull request #44659 from Ch3LL/ssh_sls_id
...
Add state.sls_id to ssh wrapper and tests
2017-11-29 09:41:47 -05:00
Nicole Thomas
97ec0e6ea0
Merge branch '2017.7' into ssh_pillar_items
2017-11-29 09:39:38 -05: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
Erik Johnson
18905cf32b
Add integration test for triggering orchestration failure via context
2017-11-28 22:03:11 -06:00
Gareth J. Greenaway
89b546c075
Merge branch 'develop' into netbox-module
2017-11-28 15:25:42 -08:00
Anthony Shaw
3611e08a27
import absolute paths
2017-11-29 10:00:41 +11:00
Gareth J. Greenaway
642eed11e1
Merge pull request #44698 from Ch3LL/mine_ssh
...
Add salt-ssh mine.get integration test
2017-11-28 14:15:28 -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
2c2e1e2332
Merge branch '2017.7' into pillar_masterless
2017-11-28 13:35:12 -05:00
rallytime
1bbe1abeb2
Allow --static option to display state runs with highstate output
...
Fixes #44556
2017-11-28 13:10:37 -05:00
Nicole Thomas
669f037761
Merge pull request #44703 from terminalmage/fix-ssh-test
...
Fix ssh state.show_top integration test (develop branch)
2017-11-28 12:41:34 -05:00
Ch3LL
c7f5af1274
Add pillar ssh integration tests
2017-11-28 12:19:41 -05:00
Ch3LL
974db59dc1
convert the assert to a union set instead
2017-11-28 10:57:55 -05:00
Ch3LL
add43c4cfe
Sort the show_top results for test_state_show_top test
2017-11-28 10:43:45 -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
Erik Johnson
1f893d1e95
Fix ssh state.show_top integration test
...
63823f3https://github.com/saltstack/salt/pull/44697#issuecomment-347373412
and the subsequent comments in that pull request.
2017-11-27 18:50:10 -06:00
Christian McHugh
249987f750
merge with develop
2017-11-27 22:04:59 +00:00
Nicole Thomas
f6a72acfe3
Merge branch '2017.7' into mine_ssh
2017-11-27 17:01:51 -05:00
Nicole Thomas
f2f6817e86
Merge pull request #44608 from Ch3LL/ssh_jinja
...
Add jinja to ssh sls test file
2017-11-27 17:00:27 -05:00
Ch3LL
9e67babf85
Add teardown to remove ssh dir
2017-11-27 16:51:02 -05:00
Ch3LL
f90b4f7653
Add salt-ssh mine.get integration test
2017-11-27 16:38:19 -05: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
364deee6ac
Merge pull request #44332 from cloudflare/improve-net-load
...
Improve the net.load_config execution function
2017-11-27 16:22:17 -05:00
Nicole Thomas
94001ffc64
lint: whitespace fixes
2017-11-27 16:15:44 -05:00
Nicole Thomas
5ec7ea0bb5
Merge pull request #44572 from Ch3LL/watchin_test
...
Add watch_in integration test
2017-11-27 15:52:31 -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
7b3ea6f5b9
mute false negative on linter
2017-11-25 19:03:23 +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
38eb0dd000
more test fixtures
2017-11-24 17:14:14 +01: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
Frode Gundersen
619bd2be1e
fix lint error
2017-11-22 21:41:59 +00:00
Ch3LL
04b5a3dd4e
Add state.sls_id to ssh wrapper and tests
2017-11-22 16:01:37 -05:00
Ch3LL
69134e83ca
Change order of local kwarg in run_call method
2017-11-22 15:50:29 -05:00
Ch3LL
b3b5ecc6ff
Add pillar.items test for masterless
2017-11-22 15:40:57 -05: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
Frode Gundersen
d406cb07a3
add status.pid test
2017-11-22 18:11:39 +00: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
df669b551d
Merge branch '2017.7' into ssh_jinja
2017-11-22 11:20:01 -05:00
Nicole Thomas
d6ccf4bb30
Merge pull request #44616 from Ch3LL/nonbase_test
...
Add Non Base Environement salt:// source integration test
2017-11-22 11:13:53 -05:00
Nicole Thomas
0a54584ddb
Merge branch '2017.7' into watchin_test
2017-11-22 11:10:55 -05:00
Nicole Thomas
cd0bac87e6
Merge branch '2017.7' into improve-net-load
2017-11-22 10:36:40 -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
Nicole Thomas
071a1bd65b
Merge branch '2017.7' into thindir_ssh
2017-11-21 22:23:09 -05:00
Nicole Thomas
80b71652e3
Merge branch '2017.7' into nonbase_test
2017-11-21 22:23:00 -05:00
Ch3LL
359a59dd64
Add salt-key -d integration test
2017-11-21 10:40:25 -05:00
Ch3LL
74ededafa7
Add ssh thin_dir integration test
2017-11-20 17:37:38 -05:00
Ch3LL
c9ba33432e
Add Non Base Environement salt:// source integration test
2017-11-20 16:53:56 -05:00
Gareth J. Greenaway
227be73e0a
Merge branch 'develop' into 43647_fix_InitiatorName_in_comments
2017-11-20 11:01:38 -08:00
Mike Place
898c28e6d9
Merge branch '2017.7' into watchin_test
2017-11-20 19:00:45 +00:00
Mike Place
446e3436c2
Merge pull request #44573 from garethgreenaway/requisite_without_module_name
...
Adding the ability to specify requisites without a state module name
2017-11-20 18:50:13 +00:00
Ch3LL
ca97517795
Add jinja to ssh sls test file
2017-11-20 12:26:09 -05:00
Ch3LL
3df70f3fed
remove iter for watch_in failure test
2017-11-20 11:32:26 -05:00
Ch3LL
ac437ddf90
add order check and remove iter
2017-11-20 11:19:25 -05:00
Nicole Thomas
bce50154e5
Merge branch '2017.7' into improve-net-load
2017-11-20 10:59:54 -05:00
Nicole Thomas
2eca2fe219
Merge branch 'develop' into requisite_without_module_name
2017-11-20 09:22:48 -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
7f2dd0382c
Merge pull request #44537 from Ch3LL/ssh_highlow
...
Add multiple salt-ssh state integration tests
2017-11-17 12:17:47 -05:00
Gareth J. Greenaway
3d2f305053
Fixing expected test results.
2017-11-16 16:02:56 -08:00
Nicole Thomas
c2c3048f46
Merge pull request #44575 from Ch3LL/ser_run_test
...
Add service.running integration state test
2017-11-16 17:27:56 -05:00
Gareth J. Greenaway
dea335e3d0
Adding state files used by new integration tests.
2017-11-16 13:26:53 -08: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
Ch3LL
7536150567
Add service.running integration state test
2017-11-16 14:12:59 -05:00
Gareth J. Greenaway
784cc7a85a
Merge remote-tracking branch 'upstream/develop' into develop
2017-11-16 09:53:04 -08:00
Ch3LL
5f2b4f434e
Add watch_in integration test
2017-11-16 12:18:30 -05:00
Gareth J. Greenaway
d341e12d04
Adding a bit of code to allow using requisites without a module name. Account for using the name without the state module in the requisite. Adding the ability to specify options to the listen state parameter without specifying the state mdoule. Adding state files used by new integration tests.
2017-11-16 08:44:31 -08:00
Nicole Thomas
be930beee6
Merge branch 'develop' into add-cloud.vmware.convert_to_snapshot-feature
2017-11-16 11:26:25 -05:00
pjcreath
f782eb61fb
Merge branch 'develop' into add_file_tree_environments
2017-11-16 10:18:49 -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
Erik Johnson
0e87a90f8d
Merge pull request #44543 from rallytime/fix-groupadd-tests
...
Groupadd test gid_min/gid_max values should be ints
2017-11-16 06:36:22 -08: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
Ch3LL
913eedc699
Add multiple salt-ssh state integration tests
2017-11-15 11:41:28 -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
rallytime
37e16cd191
Groupadd test gid_min/gid_max values should be ints
...
This fixes an issue with the groupadd integration tests. There were
two tests failing on CentOS 7 that check to ensure that the gid for
the newly added system group is between the gid_min and gid_max values.
These checks were failing because the test gid was an int, but the
compairison gids (min and max values) were strings, depending on the
distro.
This change ensures that we're compairing ints across the board.
2017-11-14 15:32:39 -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
