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
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
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
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
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
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
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
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
