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
73,924 Commits 24 Branches 182 Tags 341 MiB
514d6012f3
Commit Graph

73924 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
d9726f73a7 Remove reference to no-longer-skipped test 2016-09-15 08:57:38 -05:00
Erik Johnson
83cb406cc9 Merge branch 'twangboy-mac_pip_tests' into carbon 2016-09-15 08:56:49 -05:00
Erik Johnson
55fb5f4d2f Merge branch 'mac_pip_tests' of https://github.com/twangboy/salt into twangboy-mac_pip_tests 2016-09-15 08:56:21 -05:00
Mike Place
f5e37daba9 Merge pull request #36326 from cachedout/fix_extend_test 
Fix extend test
 2016-09-15 20:45:53 +09:00
Mike Place
93f2d108ae Fix extend test 
The test suite can't guarantee what the pwd will be. Pass it into the function under test.
 2016-09-15 20:39:39 +09:00
Mike Place
57c9cda113 Merge pull request #36324 from cachedout/minion_unique_loop_test 
Give each minion instance a new loop to avoid stale loops
 2016-09-15 20:11:56 +09:00
Mike Place
1cdfad28e8 Give each minion instance a new loop to avoid stale loops 2016-09-15 20:11:12 +09:00
Mike Place
95ac91c835 Merge pull request #36322 from cachedout/safe_minion_shutdown_tests 
Safely shutdown the minion in minion test
 2016-09-15 17:52:45 +09:00
Mike Place
70ea92db95 Safely shutdown the minion 
The test is racing the callback in the minion init.

cc: @rallytime
 2016-09-15 17:51:00 +09:00
Shane Lee
be810aaccc Merge pull request #2 from terminalmage/mac_pip_tests 
Ensure we have a test venv created using virtualenv < 13.0
 2016-09-14 22:27:21 -06:00
Erik Johnson
f4dded464c Ensure we have a test venv created using virtualenv < 13.0 
The test that runs these states is testing for behavior that was
obsoleted by virtualenv 13.0. Ensure that we have older virtualenv
available, and then create a venv with that older version. Use the
2nd virtualenv to attempt the "weird" install.
 2016-09-14 22:42:39 -05:00
kbelov
76af9186a9 added usage_plan_association present and absent states 2016-09-14 16:55:50 -07:00
Nicole Thomas
dedfd82894 Merge pull request #36309 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-09-14 16:13:26 -06:00
rallytime
ee8321eab1 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-14 15:18:22 -06:00
Nicole Thomas
fc890681da Merge pull request #36306 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-09-14 15:15:26 -06:00
kbelov
4226204430 renamed state parameters to better match AWS names 2016-09-14 13:42:12 -07:00
Justin Findlay
30fd9a622a skip pip weird install test 2016-09-14 14:40:43 -06:00
Justin Findlay
d0c4846c89 skip tests that timeout on MacOS 
Due to the changes in how the test daemons are handled, it seems.  The
tests fail intermittently.
 2016-09-14 14:40:43 -06:00
Kris Raney
5307250996 The API does not actually allow version changes to existing deployments 2016-09-14 14:52:35 -05:00
kbelov
d18c05e947 initial implementation of usage plan support in salt 2016-09-14 12:47:57 -07:00
rallytime
dd1769ea58 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/modules/file.py
  - salt/runners/cloud.py
  - salt/utils/gitfs.py
 2016-09-14 13:08:42 -06:00
Nicole Thomas
6a3019bbf1 Merge pull request #36299 from rallytime/gate-pkg-group-installed-test 
Gate the pkg.group_installed state test: not all pkg modules have group_install
 2016-09-14 13:04:26 -06:00
rallytime
9e15df9b23 Switch the order of the decorator 
When @requires_system_grains is listed before other decorators, wrapper
function gets confused on where the grains kwarg should go.
 2016-09-14 12:12:21 -06:00
Nicole Thomas
b3aac0ec20 Back-port #36273 to 2016.3 (#36295) 
* Add append_newline flag for #33686 (#36273)

* Add versionadded tag to new append_newline option
 2016-09-14 10:58:16 -06:00
Nicole Thomas
fe9194f609 Merge pull request #36298 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-09-14 10:57:52 -06:00
Nicole Thomas
729617923e Back-port #36124 to 2016.3 (#36296) 
* Use /etc instead of /root

* Skip test on anything but linux

* Add missing import (lint)
 2016-09-14 10:08:16 -06:00
Nicole Thomas
a8a72c985f Merge pull request #36297 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-14 10:07:30 -06:00
Mike Place
683730cdd7 Merge pull request #36290 from DSRCorporation/bugs/36135_minion_stops_failover 
Don't stop to failover if all masters not reachable.
 2016-09-15 01:01:30 +09:00
Mike Place
ee997be6d8 Fix pkg group test by passing a list instead of str 
Refs  integration.states.pkg.PkgTest.test_group_installed_handle_missing_package_group
 2016-09-14 09:53:10 -06:00
Kris Raney
0780555fbc Update unit test. 
Also, version is reported on status rather than config; update code to reflect that.
 2016-09-14 10:40:55 -05:00
Mike Place
56dabca43c Report the reason that a module did not load to the user via remote-ex (#36259) 2016-09-14 09:33:19 -06:00
rallytime
c7d8867096 Gate the pkg.group_installed state test: not all pkg modules have group_install 
Refs #35907
 2016-09-14 09:25:56 -06:00
Mike Place
087af91dcb Merge pull request #36294 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-09-15 00:19:31 +09:00
Mike Place
7684ebd0e7 Filter out pub kwargs from cloud runner (#36178) 
* Filter out pub kwargs from cloud runner

* Fix typo

* Proper function unpacking
 2016-09-14 09:18:09 -06:00
rallytime
95dbe1ade4 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/fileserver/__init__.py
  - setup.py
  - tests/integration/modules/git.py
 2016-09-14 09:15:29 -06:00
rallytime
e2f1cf6025 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-14 09:10:05 -06:00
Joseph Hall
3dec622eb6 Add append_newline flag for #33686 (#36273) 2016-09-14 09:04:58 -06:00
rallytime
fb994ad92f Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-14 09:00:05 -06:00
Christian McHugh
e16d2ceae8 add template.get function 2016-09-14 05:13:35 -07:00
Dmitry Kuzmenko
aff2fbba94 Don't stop to failover if all masters not reachable. 2016-09-14 15:12:12 +03:00
Mike Place
33dcfda715 Merge pull request #36288 from cachedout/fix_schema_test 
Schema test requires jsonschema 2.5.0 or above
 2016-09-14 19:04:01 +09:00
Mike Place
1357244ef9 Schema test requires jsonschema 2.5.0 or above 2016-09-14 19:03:13 +09:00
Mike Place
b68ebd8e94 Merge pull request #36226 from cachedout/docker_client 
Catch instance where docker daemon might not be running
 2016-09-14 18:23:17 +09:00
Mike Place
3b81c37a53 Merge pull request #36286 from cachedout/fix_group_test 
Fix pkg group test by passing a list instead of str
 2016-09-14 16:51:08 +09:00
Emanuel Rietveld
d8eb7494db boto3 doesn't want parameters to be None 
Remove all parameters that are None from the call to boto3
See also https://github.com/boto/boto3/issues/400
 2016-09-14 09:21:01 +02:00
Mike Place
dde623bfd5 Fix pkg group test by passing a list instead of str 
Refs  integration.states.pkg.PkgTest.test_group_installed_handle_missing_package_group
 2016-09-14 15:43:39 +09:00
Mike Place
6a76a3a7e0 Merge pull request #36265 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-09-14 14:32:15 +09:00
Mike Place
fc7a1d536f Merge pull request #36238 from pass-by-value/vmware_clone_from_snapshot 
Add ability to clone from a snapshot to salt-cloud vmware driver
 2016-09-14 14:31:50 +09:00
Mike Place
ad0326e4d7 Merge pull request #36266 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-09-14 14:29:13 +09:00
Mike Place
073b88eb5a Merge pull request #36261 from DSRCorporation/bugs/36081_salt-key_output_fix 
Fixed the changed salt-key output on accept/reject/delete actions.
 2016-09-14 14:28:28 +09:00