Commit Graph

83954 Commits

Author SHA1 Message Date
Nasenbaer
c05d9aeced Encode tags as utf-8, retry policy readout 2017-10-26 10:15:00 +02:00
Mike Place
6e33743c1a Merge pull request #44248 from Ch3LL/spm_create_repo
SPM tests: use _spm_build_files method during test_build setup
2017-10-25 21:45:02 +02:00
Ch3LL
0a387c2ecd
fix pylint 2017-10-25 12:08:29 -04:00
Ch3LL
f383f05a93
Add SPM create_repo integration test 2017-10-25 12:06:08 -04:00
Mike Place
bd75be24ca Merge pull request #44253 from Ch3LL/spm_install
Add multiple spm integration tests
2017-10-25 15:36:02 +02:00
Mike Place
75ee1ebc50 Merge pull request #44254 from twangboy/win_fix_test_win_groupadd
Fix `unit.modules.test_win_groupadd` for Windows
2017-10-25 15:33:39 +02:00
Mike Place
4c23fa63bb Merge pull request #44266 from Ch3LL/proxy_tests
Add state, grains and service proxy tests
2017-10-25 15:08:49 +02:00
Ch3LL
e5701b472d
Add state, grains and service proxy tests 2017-10-24 16:59:56 -04:00
twangboy
609361bf48
Fix some lint errors 2017-10-24 09:27:39 -06:00
twangboy
1f44d8d5e6
Document helper functions 2017-10-24 09:27:38 -06:00
twangboy
b0caec320e
Move _get_all_groups up to the top 2017-10-24 09:27:38 -06:00
twangboy
7a3ff9387d
Mock the rest of the tests 2017-10-24 09:27:38 -06:00
Erik Johnson
5ce14df82c
Change how members are retrieved in win_groupadd
This is a solution that works for the other functions that interact with
group objects, making it a better overall solution to be used widely
in win_groupadd.

This also updates the mocking in the tests such that we use a more
comprehensive fake class, and more intelligent mocking of get_sam_name
using a lambda.
2017-10-24 09:27:38 -06:00
twangboy
6ab82394be
Set up mocking
Move the code that sets up the group object, computer object and gets
existing members out of the individual functions so they can be mocked

Mock the GroupObj
Mock the ComputerObj
Mock existing members
Still need to fix info, getent, and members
2017-10-24 09:27:37 -06:00
Ch3LL
9e2e785034
add spm tests to test runner 2017-10-24 10:33:53 -04:00
Mike Place
c849f350ba Merge pull request #44244 from cloudflare/add-retcode
Add explicit non-zero retcode to napalm config functions
2017-10-24 03:23:40 -06:00
Ch3LL
4729ccd32b
Add multiple spm integration tests 2017-10-23 17:13:32 -04:00
Nicole Thomas
195b225540 Merge pull request #44228 from rklaren/fix-salt-cloud-libvirt-cleanup-after-errors
Fixes #44227, make salt-cloud/libvirt cleanup after errors more robust
2017-10-23 13:09:34 -04:00
Ric Klaren
7917d1e61e
Incorporate review comments. 2017-10-23 09:28:47 -05:00
Ric Klaren
3a10b6aef1
Fixes #44227, make salt-cloud/libvirt cleanup after errors more robust
Fix vm cleanup when salt bootstrap fails when using salt-cloud with the libvirt
provider.

Signed-off-by: Ric Klaren <ric@knightswhosay.eu>
2017-10-23 09:28:35 -05:00
Erik Johnson
01e7bab990 Merge pull request #44008 from mtorromeo/git-noexec-fix
Backport #43769 to 2017.7
2017-10-23 09:19:56 -05:00
Erik Johnson
85c0ef493f Merge pull request #44202 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
2017-10-23 09:18:29 -05:00
Mircea Ulinic
a1f27c9f00 Add explicit non-zero retcode to napalm config functions
Thanks to @dmitrykuzmenko's explanation in #43187,
we can add explicit return code for napalm
configuration related functions: when loading
configuration fails for a reason or another
(there can be several different reasons), the
function will be considered as "failed". This will not change
any behaviour on the CLI, but it is useful in the --summary
mode to see what minions failed.
2017-10-23 13:17:49 +00:00
Nicole Thomas
d7dc2bd0e8 Merge pull request #44208 from twangboy/win_fix_group.present
Fix some lint in PR: 44080
2017-10-20 12:42:01 -04:00
twangboy
61e2e9ccda
Fix some lint 2017-10-20 09:59:54 -06:00
Nicole Thomas
a7a841d9d2 Merge branch '2017.7' into git-noexec-fix 2017-10-20 11:08:20 -04:00
rallytime
99ff7a5c12
Merge branch '2016.11' into '2017.7'
Conflicts:
  - salt/utils/virtualbox.py
2017-10-20 10:36:37 -04:00
Nicole Thomas
c6d27ada51 Merge pull request #43843 from twangboy/win_unit_test_mount
Fix `unit.states.test_mount` for Windows
2017-10-20 10:27:25 -04:00
Nicole Thomas
09ddfd0c08 Merge pull request #44167 from garethgreenaway/44140_debian_ip_fixes
Fixes to modules/debian_ip
2017-10-20 10:25:38 -04:00
Mike Place
9f9e936b52 Merge pull request #43830 from rallytime/bp-43644
Back-port #43644 to 2016.11
2017-10-19 17:57:50 -05:00
Mike Place
07db6a3d8b Merge pull request #43994 from oeuftete/fix-manage-runner-presence
Fix manage.present to show lost minions
2017-10-19 17:27:58 -05:00
Mike Place
372820ea38 Merge pull request #44111 from alprs/fix-deb8-py3-oscodename
Try to correctly parse debian codename from /etc/os-release
2017-10-19 17:23:25 -05:00
Mike Place
a07537e258 Merge pull request #44188 from terminalmage/issue44150
yumpkg: Check pkgname instead of name to see if it is a kernel pkg
2017-10-19 17:20:34 -05:00
Mike Place
715edc0cea Merge pull request #44158 from rallytime/bp-44089
Back-port #44089 to 2016.11
2017-10-19 15:38:14 -05:00
Mike Place
75136152c1 Merge pull request #44187 from twangboy/win_fix_unit_test_daemons.py
Fix pickling errors on Windows
2017-10-19 15:36:50 -05:00
Mike Place
7a89cd8697 Merge pull request #44186 from garethgreenaway/44181_scheduler_multiple_whens
[2017.7] scheduler fixes
2017-10-19 15:36:03 -05:00
Mike Place
1d16ae8ba7 Merge pull request #43896 from twangboy/win_fix_lgpo_scom
Fix win_lgpo execution module
2017-10-19 15:13:17 -05:00
Mike Place
98356b86af Merge pull request #44080 from twangboy/win_fix_group.present
Fix a regression in `group.present` in Windows
2017-10-19 15:10:43 -05:00
Mike Place
5ef124bf2d Merge pull request #44171 from Ch3LL/spm_int
Add SPM Build Integration Tests
2017-10-19 14:49:13 -05:00
twangboy
29bc80ff87
Improve get_sam_name
Return the actual sam name as reported by LookupAccountName
If the user does not exist, return a fabricated SAM name
Move lower to the state module
2017-10-19 13:31:59 -06:00
twangboy
ef759a3875
Fix example in function docs for get_sam_name 2017-10-19 13:31:58 -06:00
twangboy
43740c5fed
Document 15 character limit 2017-10-19 13:31:58 -06:00
twangboy
83f36cc2ef
Account for 15 character limit in hostname 2017-10-19 13:31:58 -06:00
twangboy
aa278966de
Remove *args, pass gid as a keyword 2017-10-19 13:31:58 -06:00
twangboy
5230ecd7e1
Accept *args 2017-10-19 13:31:57 -06:00
twangboy
648d1b8d99
Catch CommandExecutionError 2017-10-19 13:31:06 -06:00
twangboy
0040082d0a
Fix pylint error 2017-10-19 13:31:06 -06:00
twangboy
91258cd6a8
Fix typo 2017-10-19 13:31:05 -06:00
twangboy
261dba347d
Put the file.remove in a try/except/else block 2017-10-19 13:31:05 -06:00
twangboy
020c2a2b85
Fix syntax error 2017-10-19 13:31:05 -06:00