rallytime
055b0701de
Lint fix from sloppy merge conflict resolution
2017-10-25 11:58:44 -04:00
rallytime
1c3cb5c6a4
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- .gitignore
- tests/unit/states/test_file.py
2017-10-25 10:04: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
8a1ea165af
Merge pull request #44259 from gtmanfred/2016.11
...
begin switching in kitchen-salt for running the test suite
2017-10-25 15:30:34 +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
Mike Place
9d6bc8509b
Merge pull request #44268 from twangboy/win_fix_lgpo_typo
...
Fix typo
2017-10-25 15:01:34 +02:00
Mike Place
0beb65a283
Merge pull request #44269 from terminalmage/fix-log-message
...
Fix log message in salt.utils.gitfs
2017-10-25 15:00:57 +02:00
Erik Johnson
bc9cd65496
Fix log message in salt.utils.gitfs
...
This needed to be using the config overlay function and not referencing
the attribute directly.
2017-10-24 17:36:29 -05:00
twangboy
a6a4c10a77
Fix typo
2017-10-24 15:35:40 -06:00
Ch3LL
e5701b472d
Add state, grains and service proxy tests
2017-10-24 16:59:56 -04:00
Daniel Wallace
56a3ad8f68
fix pylint comments
2017-10-24 12:18:27 -06:00
Daniel Wallace
4add666db1
add comment to Gemfile and move copyartifacts
...
moved copyartifacts.py to tests/support
Also added a comment to the Gemfile that this is only used to run the testsuite with kitchen-salt
2017-10-24 12:01:57 -06:00
Daniel Wallace
b4c8f7eb57
fix pylint
2017-10-24 10:44:25 -06: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
Daniel Wallace
392fd4f837
try newest salttesting
2017-10-24 09:23:46 -06:00
Daniel Wallace
79251287d0
add logging
2017-10-24 09:23:46 -06:00
Daniel Wallace
38963d5a82
use transport if not set in state_file
2017-10-24 09:23:46 -06:00
Daniel Wallace
10e309a64f
which vagrant should go to stderr
2017-10-24 09:23:46 -06:00
Daniel Wallace
9307564de0
fix output columns
2017-10-24 09:23:46 -06:00
Daniel Wallace
2da22f87e1
test opennebula
2017-10-24 09:23:46 -06:00
Daniel Wallace
9f38f16905
add opennebula to Gemfile
2017-10-24 09:23:46 -06:00
Daniel Wallace
7465f9b27a
add script for copying back artifacts
2017-10-24 09:23:46 -06:00
Daniel Wallace
255118cfd7
run tests with kitchen
2017-10-24 09:23:44 -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
Nicole Thomas
304dd2529d
Merge pull request #44160 from gtmanfred/directory
...
add changes to test return
2017-10-23 10:35:20 -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
Erik Johnson
e10395483d
Merge pull request #44205 from rallytime/bp-44177
...
Back-port #44177 to 2016.11
2017-10-23 09:09:06 -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
Senthilkumar Eswaran
b9940f8521
Fixing default redis.host in documentation
2017-10-20 10:55:41 -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
Daniel Wallace
a7d3d668f4
missed removing changes in the next test
2017-10-20 08:11:44 -06: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
