Erik Johnson
80b6bd6813
Fix integration.states.test_pip.PipStateTest.test_pip_installed_weird_install
...
Carbon 1.1.1 for some reason added six to their setup.py, which breaks
this test since it's not installed into the virtualenv. This PR forces
this test to use a version of carbon which does not dep on six in its
setup.py.
2017-12-20 06:54:30 -05:00
Frode Gundersen
dfb68f32d2
fix if statements and string
2017-12-19 19:45:19 +00:00
Nicole Thomas
e0d7b330fa
Merge pull request #44650 from frogunder/status
...
add status.pid test
2017-12-19 11:21:08 -05:00
Nicole Thomas
5137be01ec
Merge pull request #44951 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2016.11 to 2017.7
2017-12-16 08:16:23 -05:00
Frode Gundersen
48e6953e1f
fix_string_error
2017-12-14 22:40:59 +00:00
twangboy
40665d7b08
Skip test_log_created on Windows
2017-12-13 14:12:07 -07:00
rallytime
a0d2dd2069
Lint fix
2017-12-13 14:06:11 -05:00
rallytime
9db4179462
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- tests/unit/grains/test_core.py
2017-12-12 15:24:30 -05:00
Daniel Wallace
66bb755751
add test for effective acls
2017-12-12 09:58:08 -07:00
Frode Gundersen
c9fa4ed2a7
man_spm_test
2017-12-11 19:52:32 +00:00
Nicole Thomas
85160fd297
Merge pull request #44921 from Ch3LL/log_test
...
Add test to ensure log files are created
2017-12-11 13:24:15 -05:00
Nicole Thomas
54d29a61cb
Merge pull request #44787 from rallytime/groupadd-destructive-clean
...
GroupAdd test: Add destructive test decorator to entire class
2017-12-11 13:14:17 -05:00
Ch3LL
3bb58fb577
skip salt-key log creation test
2017-12-11 10:59:10 -05:00
Nicole Thomas
df28f312ac
Merge pull request #44879 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2016.11 to 2017.7
2017-12-10 11:53:43 -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
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
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
Gareth J. Greenaway
edcd581ca5
Merge branch '2017.7' into win_fix_file.managed
2017-12-07 10:00:55 -08:00
Daniel Wallace
3f1268d67f
fix patching for python 2.6
2017-12-07 08:25:26 -07:00
Nicole Thomas
7adcfbf8ec
Merge branch '2017.7' into develop2
2017-12-07 10:14:52 -05:00
Nicole Thomas
74ee7ce541
Merge pull request #44748 from twangboy/osx_fix_auto_login
...
Fix auto login support for OSX
2017-12-07 09:22:22 -05:00
Ch3LL
aeb5f4e248
Add state.running ssh integration test
2017-12-06 13:23:55 -05:00
Nicole Thomas
904c0da893
Merge branch '2017.7' into status
2017-12-06 12:51:52 -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
Ch3LL
d8f81d2e4d
fix pylint
2017-12-05 14:39:36 -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
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
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
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
twangboy
068e463870
Fix lint, add integration tests
2017-12-04 13:29:37 -07:00
Frode Gundersen
3504083849
add pkg_latest_version test
2017-12-04 20:28:52 +00:00
Daniel Wallace
1d0bd5bb32
Merge branch '2016.11' into 2016.11
2017-12-04 10:13:15 -07: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
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
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
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
Daniel Wallace
911411ed8f
add unit test
2017-11-30 13:48:30 -07: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
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
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
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
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
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
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
5ec7ea0bb5
Merge pull request #44572 from Ch3LL/watchin_test
...
Add watch_in integration test
2017-11-27 15:52:31 -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
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
Frode Gundersen
d406cb07a3
add status.pid test
2017-11-22 18:11:39 +00: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
Mircea Ulinic
3a0945ce3d
Merge pull request #11 from tonybaloney/gh_44332_clone
...
Thanks @tonybaloney
2017-11-22 10:41:01 +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
Mike Place
898c28e6d9
Merge branch '2017.7' into watchin_test
2017-11-20 19:00:45 +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
7f2dd0382c
Merge pull request #44537 from Ch3LL/ssh_highlow
...
Add multiple salt-ssh state integration tests
2017-11-17 12:17:47 -05: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
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
Ch3LL
5f2b4f434e
Add watch_in integration test
2017-11-16 12:18:30 -05:00
Ch3LL
913eedc699
Add multiple salt-ssh state integration tests
2017-11-15 11:41:28 -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
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
ba4a62769c
Fix trailing spaces
2017-11-14 09:21:55 +00: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
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
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
ebbe5949ea
Merge pull request #44457 from twangboy/win_remove_wmi_monkeypatching
...
Remove wmi monkeypatching
2017-11-13 10:38:51 -07:00
Gareth J. Greenaway
4d0806e28c
Merge branch '2017.7' into develop2
2017-11-13 10:29:46 -07: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
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
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
Nicole Thomas
5505a8819a
Merge branch '2017.7' into win_unit_test_archive
2017-11-10 11:48:51 -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
