valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
84,439 Commits 24 Branches 182 Tags 341 MiB
e6a56016df
Commit Graph

10598 Commits

Author SHA1 Message Date
Frode Gundersen
e6a56016df
update test 2018-03-13 20:54:25 +00:00
Frode Gundersen
19a2244cb7
whitelist_acl_test 2017-12-11 18:25:46 +00: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
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
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
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
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
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