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
Mike Place
79b7eb1c33
Merge branch 'develop' into 43647_fix_InitiatorName_in_comments
2017-11-13 12:20:39 -07:00
Nicole Thomas
93c54d9884
Merge pull request #44414 from garethgreenaway/req_any
...
[develop] Adding additional requisites to state compiler
2017-11-13 14:17:09 -05: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
Nicole Thomas
caa81728a0
Merge pull request #44507 from Ch3LL/pillar_time
...
Increase sleep timeout for pillar refresh test
2017-11-13 13:29:05 -05:00
Mike Place
69a50204a6
Add newline for lint.
2017-11-13 11:16:33 -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
Nicole Thomas
1da1a97d7d
Merge pull request #44490 from Ch3LL/ssh_ping
...
Enable test_deploy ssh test
2017-11-13 12:12:47 -05:00
Gareth J. Greenaway
45c9a233dc
Merge branch 'develop' into req_any
2017-11-13 09:16:56 -07:00
Ch3LL
ffa4bddcad
Increase sleep timeout for pillar refresh test
2017-11-13 10:50:16 -05:00
Nicole Thomas
18624d6798
Merge pull request #44491 from Ch3LL/ssh_raw
...
Add salt-ssh raw integration tests
2017-11-13 10:47:11 -05:00
Gabe Van Engel
ef7b6bbb81
Fixed issue with file.line on Windows running Python 2.
...
The target file was being read as binary, but written as text, causing file.line to append an extra linesep on every line.
Added integration test to ensure file.line produces the expected content.
2017-11-12 23:55:35 -08:00
Gabe Van Engel
8f89c99fa5
Fix FileModuleTest setUp and tearDown to work on Windows.
2017-11-12 23:55:35 -08:00
Gabe Van Engel
b2b8f075b9
Fixed test to work on Windows.
2017-11-12 23:55:34 -08:00
Gabe Van Engel
5a5a2dd026
Added integration test for issue #41474
2017-11-12 23:55:33 -08: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
Ch3LL
3dc8673417
change class name to raw
2017-11-10 14:47:42 -05:00
Ch3LL
308596ac8d
Add salt-ssh raw integration tests
2017-11-10 14:47:38 -05:00
Nicole Thomas
5b95495e75
Merge pull request #44484 from Ch3LL/orch_test
...
Add orchestration tests when target exists or not
2017-11-10 12:24:21 -07:00
Nicole Thomas
62c42ca6fb
Merge pull request #44480 from Ch3LL/override_pillar
...
Add integration pillar command line test
2017-11-10 12:14:31 -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
Bo Maryniuk
f0f08a10e8
Add unit test for file.line on an empty content while not deleting anything
2017-11-10 19:50:46 +01:00
Bo Maryniuk
b5a80231bd
Rename a unit test and clarify its purpose in docs
2017-11-10 19:50:46 +01:00
Bo Maryniuk
cf191b01d6
Add unit test for file.line on mode checks
2017-11-10 19:50:46 +01:00
Nicole Thomas
5505a8819a
Merge branch '2017.7' into win_unit_test_archive
2017-11-10 11:48:51 -07:00
Mike Place
8b834e341d
Merge pull request #44288 from eradman/onlyif_unless
...
Report 'onlyif' and 'unless' conditions as true or false
2017-11-10 11:37:01 -07:00
Ch3LL
e952cd6712
Enable test_deploy ssh test
2017-11-10 13:35:13 -05:00
twangboy
6c872e95e6
Add back the setup_loader_modules function
...
Use empty dict instead of defining wmi
2017-11-10 11:30:00 -07:00
Erik Johnson
20273e3697
No need for setup_loader_modules since we're actually importing wmi
2017-11-10 11:29:59 -07:00
twangboy
8c107873cd
Remove wmi monkeypatching
...
The WMI object was being monkey patched in the global namespace causing
other tests to fail
2017-11-10 11:29:54 -07:00
Mike Place
cc08ad2edc
Merge pull request #44317 from Ch3LL/ssh_test
...
Add state tests and state request system to salt-ssh
2017-11-10 11:28:42 -07:00
Nicole Thomas
9302149604
Merge branch 'develop' into develop
2017-11-10 10:56:12 -07:00
Nicole Thomas
0a8419358b
Merge branch 'develop' into separate-key-dir-from-cache-dir
2017-11-10 10:39:53 -07:00
Nicole Thomas
9fb9fecfa7
Merge branch 'develop' into 42713_mine.get_back_compat
2017-11-10 10:06:11 -07:00
Ch3LL
f3ec6df76e
Add orchestration tests when target exists or not
2017-11-10 12:00:12 -05:00
Ch3LL
46bce3bd5e
add additional parser argument for ssh integration tests
2017-11-10 10:58:38 -05:00
Ch3LL
e9231430b5
remove logic similar to cloud/proxy tests
2017-11-10 10:48:31 -05:00
Ch3LL
c731eb8ea6
add ssh dir to test runner when --ssh-tests set
2017-11-10 10:48:31 -05:00
Ch3LL
8089a885c2
add wipe function to other run_ssh method
2017-11-10 10:48:31 -05:00
Ch3LL
e3ebb5e9b3
fix comment and variables
2017-11-10 10:48:30 -05:00
Ch3LL
faef0886a7
Add state tests and state request system to salt-ssh
2017-11-10 10:48:30 -05:00
Ch3LL
12fed1b4d8
Add integration pillar command line test
2017-11-10 10:43:37 -05:00
rallytime
9fcc2a70b5
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- tests/unit/modules/test_rh_ip.py
2017-11-10 10:33:25 -05:00
twangboy
0a9e862bf4
Use regex to split
2017-11-09 16:24:19 -07:00
twangboy
b1dfe9c3c8
Format patching with statements for easier reading
2017-11-09 14:32:21 -07:00
twangboy
ba2f2eb788
Add Erik's changes
2017-11-09 14:32:21 -07:00
twangboy
4ef1e3eb97
Fix unit.states.test_archive for Windows
...
Use os agnostic paths
Mock `salt.utils.which` for Windows
Handle urlparse return on Windows
2017-11-09 14:32:21 -07:00
Erik Johnson
c1b6d35c0c
Python 3 compatibility fixes for kubernetes
...
dict.keys() is not a list in Python 3, and base64.b64encode requires
a bytestring.
2017-11-09 15:05:43 -06:00
Erik Johnson
b6ccfb45c8
Wait until after restoring original resource limit before removing temp files
...
Invoking shutil.rmtree() first was causing a traceback since the max
open files setting was still set very low for the test. This moves the
shutil.rmtree() until after we have restored the original resource
limit.
2017-11-09 15:05:43 -06:00
Erik Johnson
8a7d56369c
Use with blocks (or try/finally) to ensure filehandles are closed
...
This fixes a few sources (or potential sources) of filehandle leaks.
2017-11-09 15:05:40 -06:00
Gareth J. Greenaway
7cdf703884
Updating tests for watch_any_fail and require_any_fail.
2017-11-08 16:06:44 -08:00
Gareth J. Greenaway
4dbd3e5567
Updating unit tests to limit to two required states.
2017-11-08 16:06:44 -08:00
Gareth J. Greenaway
efbfa5abf2
Adding state file used in integration tests.
2017-11-08 16:06:44 -08:00
Gareth J. Greenaway
58d22a169c
Adding docs and integration tests.
2017-11-08 16:06:43 -08:00
Gareth J. Greenaway
3ffab16a4d
If a state is in prerequired, do not add to the self.pre to the list of requirements.
2017-11-08 16:06:43 -08:00
Gareth J. Greenaway
d9dcb84fe3
tweaking
2017-11-08 16:06:43 -08:00
Gareth J. Greenaway
d2bfa95018
Merging in watch_any changes
2017-11-08 16:06:43 -08:00
Nicole Thomas
2bf0df89cd
Merge pull request #44403 from eradman/swap_total
...
Implement swap_total grain on OpenBSD
2017-11-08 14:48:45 -07:00
Erik Johnson
5932e8a8ae
Merge pull request #44407 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-11-08 11:50:05 -08:00
Eric Radman
26417d8e83
Add integration test for (mem|swap)_total grains on OpenBSD
2017-11-08 14:38:20 -05:00
Ch3LL
5d1a9af4b5
Add salt-ssh grains.items test
2017-11-08 13:41:11 -05:00
Gareth J. Greenaway
df937bf2fa
Merge branch 'develop' into 43647_fix_InitiatorName_in_comments
2017-11-08 10:58:22 -07:00
Georges Racinet
5c01c74fbc
Merge branch 'develop' of github.com:saltstack/salt into 42713_mine.get_back_compat
...
... and fixed conflict
2017-11-08 18:09:04 +01:00
Georges Racinet
728c9b65a5
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.
2017-11-08 18:02:29 +01:00
Nicole Thomas
8ffe91fe44
Merge pull request #44405 from SEJeff/kubernetes-updates-v2
...
Kubernetes updates v2
2017-11-07 12:17:43 -07:00
Jorge Schrauwen
3af235250d
Remove _zpool_data from the bsd_memdata test for grains
2017-11-07 08:17:50 +01:00
Nicole Thomas
c03e997144
Merge pull request #44246 from nicholasmhughes/add-location-to-file.line-ensure
...
Add location support to file.line ensure
2017-11-06 22:35:18 -07:00
Sean Jenkins
ed8cccf457
#39901 : Fix pylint
2017-11-06 17:02:53 -07:00
Sean Jenkins
43c81dfdee
#39901 : Add unit tests
2017-11-06 15:04:22 -07:00
rallytime
f26beffe48
Update old utils paths to new paths
2017-11-05 20:39:40 -07:00
rallytime
2c052e34b3
Merge branch '2017.7' into 'develop'
...
Conflicts:
- .gitignore
- salt/modules/win_lgpo.py
- salt/utils/__init__.py
- tests/integration/spm/test_build.py
- tests/unit/test_pydsl.py
2017-11-05 20:28:51 -07:00
Anthony Shaw
c63222358b
update tests with correct assertions and mock methods on device instance
2017-11-06 05:01:31 +02:00
Anthony Shaw
b69c559c52
fix kwargs typo
...
setup basic unit test class
update wrapper
2017-11-06 04:39:30 +02:00
Jeff Schroeder
eaaa4dcf8e
Up the total test coverage of the kubernetes state to 54%!
...
* Add 100% test coverage for the kubernetes.node_label_absent state
* Add 100% test coverage for the kubernetes.namespace_present state
* Add 100% test coverage for the kubernetes.namespace_absent state
2017-11-05 20:11:25 -06:00
Jeff Schroeder
2b44f7ca85
Small formatting fixup
2017-11-05 20:11:17 -06:00
Jeff Schroeder
7039d74e90
More kubernetes state tests
...
* Add 100% test coverage for the kubernetes.secret_absent state
* Add 100% coverage for kubernetes.node_label_present
* Also add 'comment' to kubernetes.node_add_label
* Make the faux test objects more believable in test_kubernetes.py
2017-11-05 17:57:29 -06:00
Jeff Schroeder
2b02a46544
Add the beginning of tests for states.kubernetes and update things
...
* Add 100% test coverage for the kubernetes.secret_present state
* Add 100% test coverage for the kubernetes.configmap_absent state
* Add 100% test coverage for the kubernetes.configmap_present state
* Make some fields optional to kubernetes.create_secret and add examples
* Make some fields optional to kubernetes.replace_secret and add examples
* Make some fields optional to kubernetes.create_configmap and add examples
* Make some fields optional to kubernetes.replace_configmap and add examples
* Add 'comment' when a kubernetes configmap or secret is going to be replaced
* Update 'source', 'template', and 'saltenv' kwargs to defaults from the rest of the codebase
* Allow passing empty 'data' to the kubernetes.configmap_present state to remove the existing contents
2017-11-05 13:34:37 -06:00
Mike Place
1412a42f0e
Merge pull request #44070 from gtmanfred/kitchen
...
begin adding kitchen-salt into the test suite
2017-11-02 15:55:33 -06:00
Benedikt Werner
4a63798e84
Fixed linting
2017-11-01 01:01:22 +01:00
Ch3LL
952c6bfea4
Include file size check for test_spm_build_big_file test
2017-10-31 18:18:37 -04:00
Benedikt Werner
7bb85f417f
Merge branch 'develop' into develop
2017-10-31 23:15:03 +01:00
Mike Place
c46490c183
Merge pull request #44190 from prymitive/postgres_extension
...
Fix test=true checks so that state runs in test mode don't report cha…
2017-10-31 11:53:06 -06:00
Mike Place
57705b9e6a
Merge pull request #44231 from SEJeff/kubernetes-stuff
...
Kubernetes module updates round one
2017-10-31 11:21:28 -06:00
Benedikt Werner
82d6cb72f0
Merge branch 'develop' into accept-minions-from-grains
2017-10-31 13:55:11 +01:00
Gareth J. Greenaway
06080612bc
Merge branch 'develop' into 43647_fix_InitiatorName_in_comments
2017-10-30 17:54:57 -04:00
Daniel Wallace
947bb86695
comment wordpress module
2017-10-30 13:34:28 -06:00
Daniel Wallace
2659b8b03e
remove pypi.c7 from tests
2017-10-30 13:05:35 -06:00
Benedikt Werner
4c5259da3a
Fix syntax error in unit test
2017-10-30 17:30:21 +01:00
Benedikt Werner
23d3c71a55
Fix unit test
2017-10-30 17:27:28 +01:00
Nicole Thomas
835e6714ae
Merge branch 'develop' into publish_refactor_use_check_authentication
2017-10-30 11:06:59 -04:00
Nicole Thomas
716aabc0bf
Merge branch '2017.7' into service_test
2017-10-29 11:32:33 -04:00
Benedikt Werner
7d347e07b4
Remove trailing whitespace
2017-10-29 15:29:52 +01:00
Benedikt Werner
bcba351f19
Clean up on test skip
2017-10-29 14:02:40 +01:00
Benedikt Werner
4a4088c869
Fix typo
2017-10-29 14:02:40 +01:00
Benedikt Werner
a546bac5f8
Fix test autosign files by using regexes
2017-10-29 14:02:40 +01:00
Benedikt Werner
3c0b324452
More quiet test.pings
2017-10-29 14:02:40 +01:00
Benedikt Werner
9866074857
Fix autosign_grains file permissions in test
2017-10-29 14:02:39 +01:00
Benedikt Werner
603bc02131
Run test.ping quiet
2017-10-29 14:02:39 +01:00
Benedikt Werner
c7ee766984
Fix test autosign_file permissions
2017-10-29 14:02:39 +01:00
Benedikt Werner
51ce80ce50
Fix style
2017-10-29 14:02:38 +01:00
Benedikt Werner
9786c2b328
Fix wrong rootdir foldername in test
2017-10-29 14:02:38 +01:00
Benedikt Werner
64e30ac0b2
Changed integration tests to use autosign_file to authenticate minions
2017-10-29 14:02:38 +01:00
Benedikt Werner
6db9143f08
Changed runtest daemons option help
2017-10-29 14:02:37 +01:00
Benedikt Werner
130cdcea7e
Added -y option to salt-key calls
2017-10-29 14:02:37 +01:00
Benedikt Werner
1403778c5b
Renamed 'Dameons Tests' to 'Daemon Tests'
2017-10-29 14:02:37 +01:00
Benedikt Werner
d06d031227
Moved autosign grains integration tests to its own file
2017-10-29 14:02:37 +01:00
Benedikt Werner
7ab028f99c
Fix autosign grains integration test
2017-10-29 14:02:36 +01:00
Benedikt Werner
8f2693237c
Fixed and improved autoaccept grains docs
2017-10-29 14:02:36 +01:00
Benedikt Werner
46d0979b94
Fixed autosign grains unit test
2017-10-29 14:02:36 +01:00
Benedikt Werner
244b8c2049
Fix masterapi unit test
2017-10-29 14:02:18 +01:00
Benedikt Werner
757a64a1c7
Added integration tests for autosign grains
2017-10-29 13:54:08 +01:00
