valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
73,582 Commits 24 Branches 182 Tags 341 MiB
f4dded464c
Commit Graph

73582 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
twangboy
c01ec228e1 Skip weird_install test on Mac OS X 2016-09-13 11:35:38 -06:00
twangboy
4ae8a43435 Fix test_issue_6833_pip_upgrade_pip test on OSX 2016-09-12 12:17:30 -06:00
Hengyang Hu
3c694a371b make a centralized master_event func, replace the hardcoded ones across the codebase (#36221) 2016-09-12 09:22:20 -06:00
Erik Johnson
b83c0b9238 salt.utils.gitfs: Fix ref to self.root (#36215) 
This regressed during a recent merge-forward. See here for more info:

https://github.com/saltstack/salt/commit/2b1ad9e#diff-2c34a66e40db8ce28e251f98de56ce31L406

Resolves #36095.
 2016-09-12 08:39:22 -06:00
Mike Place
5a7a72346a Merge pull request #36202 from hu-dabao/add-36049 
for 36049, log current connected master and make status module more useful and efficient
 2016-09-12 08:18:24 +09:00
Mike Place
5ddf0af23e Merge pull request #36166 from jfindlay/parallels 
modules.parallels.delete: allow multiple IDs for same name
 2016-09-12 08:00:56 +09:00
Mike Place
1eb67df61e Merge pull request #36198 from gtmanfred/carbon 
add keystone state integration tests
 2016-09-11 18:16:38 +09:00
Hengyang Hu
5f339356cf for 36049, log current connected master and make status module more useful and efficient 2016-09-09 17:22:50 -07:00
Mike Place
7d25344574 Merge pull request #36194 from jfindlay/mac_timezone 
skip some mac_timezone tests
 2016-09-10 09:07:07 +09:00
Mike Place
b504d07006 Merge pull request #36196 from twangboy/mac_brew_tests 
Fix test_latest_version test
 2016-09-10 09:03:57 +09:00
Daniel Wallace
1c31d5e464 add keystone state integration tests 
fix api_version for using connection_args
 2016-09-09 17:14:44 -05:00
twangboy
075ceb09ab Fix test_latest_version test 2016-09-09 14:14:51 -06:00
Megan Wilhite
393bbef63b Add test 35015 (#35945) 
* add salt-key eauth tests

* add salt-run with eauth tests

* add method docs

* change expected return
 2016-09-09 12:58:50 -06:00
Justin Findlay
eaada10e89 skip some mac_timezone tests 2016-09-09 12:34:24 -06:00
Nicole Thomas
846f940fd2 Merge pull request #36186 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-09-09 11:29:19 -06:00
rallytime
3ed6190ece Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/minion.py
 2016-09-09 09:36:57 -06:00
Mike Place
1d5f97d36b Merge pull request #35907 from rallytime/fix-35819 
Catch CommandExecutionError when the group in group_installed doesn't exist
 2016-09-09 19:14:16 +09:00
Mike Place
e1bb2663ba Merge pull request #35985 from DSRCorporation/bugs/35945_salt-key_print_errors_to_stdout 
Print errors to stdout in salt-key as it's done in salt and salt-run.
 2016-09-09 19:03:32 +09:00
Mike Place
40127b6bf3 Merge pull request #36068 from rallytime/fix-35972 
Remove grains type deprecation warning from 2016.3
 2016-09-09 19:00:50 +09:00
Mike Place
31b2ef2585 Merge pull request #36124 from twangboy/linux_acl_test_mac 
Skip test on all OS's but linux
 2016-09-09 18:59:35 +09:00
Mike Place
afd0eb8f18 Merge pull request #36160 from terminalmage/fix-nested-indent 
Allow for nested outputter to accept base indentation level as a kwarg
 2016-09-09 18:46:11 +09:00
Mike Place
24bd03734d Merge pull request #36152 from cachedout/issue_36094 
Remove unnecessary unpack
 2016-09-09 18:13:46 +09:00
Nicole Thomas
f82c91dbd4 Merge pull request #36174 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-09-08 17:28:35 -06:00
rallytime
c30f697dfd Pylint fix 2016-09-08 17:23:15 -06:00
rallytime
6da0fbbe96 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/modules/cmdmod.py
  - salt/modules/linux_sysctl.py
  - tests/unit/cloud/clouds/dimensiondata_test.py
  - tests/unit/cloud/clouds/gce_test.py
  - tests/unit/modules/boto_iot_test.py
  - tests/unit/modules/mount_test.py
  - tests/unit/states/boto_iot_test.py
  - tests/unit/utils/network.py
 2016-09-08 16:14:04 -06:00
Nicole Thomas
dc3a68ed8c Merge pull request #36158 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-08 15:53:49 -06:00
Joseph Hall
1a7996125a Fix breakage from updates to __utils__ (#36168) 2016-09-08 15:49:45 -06:00
Nicole Thomas
3445a333d5 Remove unclosed backticks in walkthrough doc (#36170) 2016-09-08 15:49:01 -06:00
twangboy
e6b34c414d Add missing import (lint) 2016-09-08 15:37:21 -06:00
Thomas S Hatch
93d8a83271 Merge pull request #36086 from twangboy/mac_power_tests 
Fix tests for mac_power module on various systems.
 2016-09-08 14:52:37 -06:00
Thomas S Hatch
736903222a Merge pull request #36122 from twangboy/mac_system_tests 
Fix test not starting, skip broken functions
 2016-09-08 14:42:48 -06:00
Justin Findlay
ad9ce5b4bc modules.parallels: remove redundant state function 
function is redundant with status, which prlctl provides natively
 2016-09-08 14:22:59 -06:00
Justin Findlay
3a97818458 modules.parallels.delete: allow multiple IDs for same name 
When parallels creates linked clones, it generates a new snapshot on the
cloned VM with the name 'Snapshot for linked clone', which when used
with jenkins results in hundreds of unneeded snapshots per week.
 2016-09-08 14:22:26 -06:00
twangboy
bd65259605 Skip test on anything but linux 2016-09-08 13:46:41 -06:00
Nicole Thomas
0e8e66877a Back-port #36067 to carbon (#36159) 
* Fix signal handling

We had a little mix-up with the args ordering for our signal handling.

This sends the proper signal to processes on cleanup.

I have also temporarily disabled the pytest engines because they were
causing the minions to try to to connect to a master IPC socket which could not be found.

This put the minions into a continual futex state which was not playing well with kill sigs.

* Lint
 2016-09-08 13:03:12 -06:00
Erik Johnson
abe398271b Use string.ascii_lowercase (#36163) 
This is less error-prone than defining a string with all lowercase
letters.

This also uses a tuple for the join as the tuple is a lighter-weight
type and performs the join almost twice as fast as when this is done
with a list, as can be seen below:

>>> import timeit
>>> list_timer = timeit.Timer('":".join(["foo", "bar"])')
>>> tuple_timer = timeit.Timer('":".join(("foo", "bar"))')
>>> list_timer.repeat()
[0.18616199493408203, 0.14670491218566895, 0.14609003067016602]
>>> tuple_timer.repeat()
[0.10539507865905762, 0.08876705169677734, 0.08883404731750488]
>>>
 2016-09-08 13:02:21 -06:00
Jacob Hammons
4ccf8a841f Merge pull request #36161 from jacobhammons/relnotes 
Adds #36055 to release notes
 2016-09-08 11:11:36 -06:00
Jacob Hammons
ecb0979be7 Adds #36055 to release notes 2016-09-08 11:10:56 -06:00
rallytime
7f955bda0a Merge branch '2015.8' into '2016.3' 
Conflicts:
  - tests/unit/modules/boto_vpc_test.py
  - tests/unit/modules/mount_test.py
  - tests/unit/modules/puppet_test.py
 2016-09-08 10:55:57 -06:00
Erik Johnson
729aade72b Accept kwargs in other outputters 
Since salt.output now passes kwargs, the outputters need to accept them,
even when they do not use them.
 2016-09-08 11:54:44 -05:00
Erik Johnson
4bdd0a8c24 Pass nested_indent to the outputter as a kwarg instead of in opts 2016-09-08 11:49:37 -05:00
Erik Johnson
b42066e574 Accept and pass kwargs when invoking outputters 2016-09-08 11:47:52 -05:00
Erik Johnson
9b9d132a26 Allow nested_indent to be passed as a kwarg 2016-09-08 11:44:19 -05:00
Mike Place
6242702288 Fix issue with cp.push (#36136) 
Incorrect handling of os.path.splitdrive()
 2016-09-08 09:27:28 -06:00
Denys Havrysh
0e13118f6e Document owner kwarg for postgres_schema.present state function (#36147) 2016-09-08 09:25:11 -06:00
Mike Place
95eb95a0f8 Remove unnecessary unpack 
This was causing msgpack stacktraces everywhere because it would effectively try to unpack an empty msg.

Closes #36094
 2016-09-08 23:51:07 +09:00
Mike Place
0b35b91caa Merge pull request #36092 from UtahDave/fix_pwd_stacktrace 
don't stacktrace on import pwd on Windows
 2016-09-08 22:26:00 +09:00
Mike Place
c4e54c853d Merge pull request #36125 from rallytime/test-35172 
Add some unit tests for the jid_queue functionality in minion.py
 2016-09-08 22:23:32 +09:00
Mike Place
0648a7f417 Merge pull request #36132 from UtahDave/carbon_grains_test 
add windows core grain test
 2016-09-08 22:21:43 +09:00