Commit Graph

73494 Commits

Author SHA1 Message Date
twangboy
1c83b37fe6 Fix unquoted integers 2016-09-08 17:07:28 -06:00
twangboy
345cd7f9c1 Fix test_launchctl test 2016-09-08 16:30:35 -06:00
Joseph Hall
1a7996125a Fix breakage from updates to __utils__ (#36168) 2016-09-08 15:49:45 -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
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
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
David Boucha
64a576fc6e add windows core grain test 2016-09-07 21:22:24 -06:00
Mike Place
eac9935b58 Merge pull request #36044 from Ch3LL/add_test_state_event
add salt-run state.event test
2016-09-08 10:23:49 +09:00
Mike Place
a5b036962e Merge pull request #36091 from UtahDave/36087_pkg_stacktrace
add missing imports and namespace them
2016-09-08 09:15:15 +09:00
David Boucha
453e80c611 Add check for pwd module to the __virtual__ func 2016-09-07 18:03:40 -06:00
David Boucha
277939e0c3 don't stacktrace on import pwd on Windows 2016-09-07 18:03:40 -06:00
Nicole Thomas
d0bfbe8820 Fix Windows salt-master (#36119)
The salt-master on Windows was broken by PR #35703 due to the change in
how the ReqServer object was started in a new process. The new way
failed to correctly pickle/unpickle the args/kwargs. To fix this, we
use `__setstate__` and `__getstate__` similar to how other objects in
the same file handle it (such as the `Maintenance` object).

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2016-09-07 16:02:45 -06:00
Nicole Thomas
760da9df6a Merge pull request #36117 from rallytime/merge-carbon
[carbon] Merge forward from 2016.3 to carbon
2016-09-07 16:01:46 -06:00
rallytime
07172cf371 Add some unit tests for the jid_queue functionality in minion.py
Refs #35172 and #28785
2016-09-07 14:15:35 -06:00
twangboy
b4112247a4 Fix test not starting, skip broken functions 2016-09-07 12:01:38 -06:00
rallytime
40d0def479 Merge branch '2016.3' into 'carbon'
Conflicts:
  - salt/states/archive.py
2016-09-07 10:11:36 -06:00
Ch3LL
ee398a94b6 fix pylint 2016-09-07 10:05:44 -06:00
Mike Place
45ba2e806b Merge pull request #35923 from kstreee/fix-cli-stalling
Fixes a bug that Ctrl-c not working on Salt CLI.
2016-09-07 20:47:50 +09:00
Mike Place
6460412b1c Merge pull request #36042 from jfindlay/parallels
add functions to parallels execution module
2016-09-07 15:09:10 +09:00
Mike Place
48dc5ad4ee Merge pull request #36078 from thatch45/failhard_test
Failhard test=True fix
2016-09-07 14:10:35 +09:00
Mike Place
4e609a2962 Merge pull request #36062 from rallytime/fix-36045
Add test to catch sample config files that are not commented out
2016-09-07 10:30:30 +09:00
David Boucha
75933869cb disable some pylint checks 2016-09-06 17:32:22 -06:00
David Boucha
31ed4039b6 add missing imports and namespace them
Fixes #36087
2016-09-06 17:29:09 -06:00
plastikos
dde85e1144 Various fixes for MacOS X (#36085)
* Change "unknown" user to "some_unknown_user_xyz" since "unknown"
  *is* a valid user

* Add timeout to proxy test_exit_status_no_proxyid() since a known
  failure case is to infinitely loop with an error.

* Always force the source code tree under test to be the first entry
  in PYTHONPATH (excluding verbatim_env)
2016-09-06 16:30:08 -06:00
Nicole Thomas
017a3df12b Merge pull request #36084 from rallytime/bp-36077
Back-port #36077 to carbon
2016-09-06 16:29:45 -06:00
Ch3LL
4afc82ac63 add salt-run state.event test 2016-09-06 15:16:16 -06:00
Thomas S Hatch
40081176af Merge pull request #34529 from Ch3LL/add_skip_verify_archive
Add skip_verify for archive.extracted
2016-09-06 15:05:31 -06:00
twangboy
9e0f45785a Fix some lint 2016-09-06 15:02:02 -06:00
twangboy
ca414e01de Fix capitalization error in setUp and tearDown 2016-09-06 15:02:02 -06:00
twangboy
af3f70d877 Seperate sleep on power button test 2016-09-06 15:02:02 -06:00
twangboy
c2b42f69c1 Move test available into their own classes 2016-09-06 15:02:02 -06:00
twangboy
efb425781f Fix lint errors 2016-09-06 15:02:02 -06:00
twangboy
35dd0619cb Check string type 2016-09-06 15:02:02 -06:00
twangboy
701031ff40 Fix sleep_on_power test 2016-09-06 15:02:02 -06:00
twangboy
5e19d4664a Check the availablity of individual tests 2016-09-06 15:02:02 -06:00
twangboy
d0d36bb874 Fix syntax error (lint) 2016-09-06 15:02:02 -06:00
twangboy
9be71e5a5d Check for Desktop, fix some functions 2016-09-06 15:02:02 -06:00
rallytime
52c5804303 Make sure all thorium docs have correct formatting tags 2016-09-06 14:29:38 -06:00
Joseph Hall
fa24c8e789 Add docstrings for thorium modules (#36077)
* Add docstrings for thorium modules

* Formatting
2016-09-06 14:23:29 -06:00
Nicole Thomas
af0d4268cd Import "salt.ext.six" instead of "six" (#36076)
The Windows distribution doesn't come with `six` as a pre-installed
python package. Since `salt.ext.six` already exists, it makes sense
to use that instead of adding `six` to the Windows distribution.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2016-09-06 13:46:51 -06:00
Nicole Thomas
ad558f14e4 Merge pull request #36074 from rallytime/merge-carbon
[carbon] Merge forward from 2016.3 to carbon
2016-09-06 13:46:13 -06:00
Nicole Thomas
fc41c744a0 Merge pull request #36073 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-09-06 13:45:48 -06:00
Thomas S Hatch
9b36904149 Fix failhard causing test=True to failhard too soon 2016-09-06 12:32:01 -06:00
rallytime
da25415e2c Merge branch '2016.3' into 'carbon'
Conflicts:
  - salt/minion.py
  - salt/modules/gentoo_service.py
  - salt/utils/event.py
  - salt/wheel/key.py
2016-09-06 11:11:34 -06:00
rallytime
e9c634685b Merge branch '2015.8' into '2016.3'
No conflicts.
2016-09-06 10:52:01 -06:00
Jonathan Ballet
fa09050150 consul: fix formatting of consul.agent_join (#36061) 2016-09-06 10:43:04 -06:00