Commit Graph

73431 Commits

Author SHA1 Message Date
Mike Place
6216e1df8c Merge pull request #36050 from m03/add-initial-win_snmp-unit-tests
Add initial unit tests for win_snmp
2016-09-07 14:26:01 +09:00
Mike Place
37cfbe66b0 Merge pull request #36099 from cachedout/pr-36097
Skip /etc/adjtime check if RTC is N/A (#4983)
2016-09-07 13:25:02 +09:00
Mike Place
92ce37f6e2 Lint 2016-09-07 13:24:45 +09:00
Adam Bolte
3437a06084
Skip /etc/adjtime check if RTC is N/A (#4983) 2016-09-07 12:29:30 +10:00
Mike Place
8d82f7aae5 Merge pull request #36035 from skizunov/develop2
Fix Windows salt-master
2016-09-07 10:28:35 +09:00
plastikos
1101e30389 Various fixes for MacOS X (#36080)
* 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:29:26 -06:00
Joseph Hall
66f0b69f75 Add docstrings for thorium modules (#36077)
* Add docstrings for thorium modules

* Formatting
2016-09-06 14:18:36 -06:00
Nicole Thomas
e7e1330d02 Merge pull request #36075 from rallytime/merge-develop
[develop] Merge forward from carbon to develop
2016-09-06 13:46:33 -06:00
Mike Place
e79c42e515 Fix signal handling (#36067)
* 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-06 11:30:21 -06:00
rallytime
cf7a590a71 Merge branch 'carbon' into 'develop'
No conflicts.
2016-09-06 11:14:22 -06:00
Moe
3c264528fb Expand/improve win_iis_test tests (#36053)
* Expand win_iis_test tests

* Fix linting issue
2016-09-06 10:47:28 -06:00
Nicole Thomas
d147887bb3 Pylint fix for #36043 (#36071)
Refs #36043
2016-09-06 10:24:41 -06:00
mwinnett
d6d38aad9e Update versionadd tags 2016-09-06 09:22:55 -07:00
Tom Williams
d56b014d67 INFRA-3936 - Wait up to 30 seconds for EIP to come online (#36043) 2016-09-06 10:21:55 -06:00
Nicole Thomas
3fefba22b0 Add versionadded tags to new start/stop functions in gce driver (#36066)
Refs #36017
2016-09-06 10:05:06 -06:00
Mike Place
8656c0d34b Merge pull request #35992 from terminalmage/carbon-tests
Tests for new Carbon features
2016-09-07 01:01:09 +09:00
Antonio Lobato
69461f50c7 Added support for instance start and stop actions in GCE (#36017)
* Added support for instance start and stop actions in GCE

* added cloud events for rebooting, starting, and stopping of GCE instances

* Fixed lack of double newline between new functions in salt-cloud GCE provider.
2016-09-06 08:53:03 -06:00
mwinnett
64b3649ab6 Add unit tests for win_snmp state 2016-09-05 00:30:35 -07:00
Erik Johnson
9ae753f6ed Use self.run_run instead of self.run_run_plus
Using a salt.runner.Runner() instance to run this test has exposed a
problem with run_run_plus, where the fileclient doesn't behave as
expected. Since the raw return data is not needed, using run_run here
lets the test pass while we continue to work on run_run_plus.
2016-09-03 14:59:04 -05:00
Erik Johnson
e36d6839d1 Two fixes in _get_envs()
1. Don't get client_envs twice.
2. Don't add 'base' more than once.
2016-09-03 14:59:04 -05:00
Erik Johnson
ab9a89d6dc Add test for jid in runner ret events (zh 858) 2016-09-03 14:59:04 -05:00
Erik Johnson
3345da0d36 Add tests for gitfs per-saltenv configuration (#29954) 2016-09-03 14:59:04 -05:00
Erik Johnson
c35ed45668 Rename test file so that it runs properly when unit tests are executed 2016-09-03 14:59:04 -05:00
Erik Johnson
92d6d4ab75 Fix incorrect key for return data
The return data from run_run_plus previously returned the runner return
in the ``fun`` key. This has since been corrected. This commit replaces
these references to the ``fun`` key with the corrected ``return`` key.
2016-09-03 14:59:04 -05:00
Erik Johnson
5673395f0c Update usage of run_run_plus to remove unused "options" argument 2016-09-03 14:59:04 -05:00
Erik Johnson
d4059a0d79 Update the run_run_plus docstring 2016-09-03 14:59:04 -05:00
Erik Johnson
a3442a88ed Update docs on run_run_plus 2016-09-03 14:59:04 -05:00
Erik Johnson
74d5f3aa51 Remove unused argument 2016-09-03 14:59:04 -05:00
Erik Johnson
a4e96cfb7a Don't execute the runner twice in run_run_plus
Instead, compile output by executing salt.output.display_output() on the
return data obtained from executing the runner via the Python API.
2016-09-03 14:59:04 -05:00
Erik Johnson
b3dfd95a6d Support writing output to an open filehandle/file-like object 2016-09-03 14:59:04 -05:00
Erik Johnson
f41db032a2 Add ability to reload client_config to run_run_plus
This allows one to pass a kwarg to run_run_plus called
``__reload_config`` which will be passed as the ``from_scratch``
argument to self.get_config(). This allows self.run_run_plus() to force
a reload of the master config for integration tests which require the
config to be reloaded, for instance, from master.d/*.conf.
2016-09-03 14:59:04 -05:00
Erik Johnson
693ea2a066 Remove code adding runner return data to master job cache
This has been removed in favor of the one already in
salt/client/mixins.py.
2016-09-03 14:59:04 -05:00
Erik Johnson
09907cadc1 Add code to disable runner_returns via config option
This also will allow any future classes which happen to use this mixin
to disable storing the job data in the master job cache.
2016-09-03 14:59:04 -05:00
Erik Johnson
6f8984630d Change default for runner_returns to True 2016-09-03 14:59:04 -05:00
Erik Johnson
230c684d4c Add test case for runner returns 2016-09-03 14:59:04 -05:00
Erik Johnson
c872f12f9c Replace _jid_dir() with salt.utils.jid.jid_dir() 2016-09-03 14:59:03 -05:00
Erik Johnson
c278b1f52c Move function for jid_dir to salt.utils.jid
This makes it more readily available for integration tests
2016-09-03 14:59:03 -05:00
Erik Johnson
070e5f3c48 Fix typo, add return and jid to run_run_plus
Also make kwargs work (they were being ignored)
2016-09-03 14:59:03 -05:00
Erik Johnson
d53e1ce9a4 Remove usage of double-asterisk for state.orchestrate runner
This prevents the entire master opts from being part of the event data
for orchestration jobs.
2016-09-03 14:59:03 -05:00
Erik Johnson
573442fe82 Add orchestration_jid directly to kwargs which will be passed to state.orchestrate 2016-09-03 14:59:03 -05:00
mwinnett
2b92c383f1 Add initial unit tests for win_snmp 2016-09-03 12:34:28 -07:00
skizunov
93174eb572 Import "salt.ext.six" instead of "six" (#36036)
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-02 14:57:41 -06:00
Nicole Thomas
03ebb59e5e Remove commented out skipIf lines in boto_vpc_test module (#36013)
If we're running these tests successfully now, then let's remove these lines.
2016-09-02 14:37:41 -06:00
Tom Williams
c4d61cdce8 INFRA-3936 - fix bug in boto_ec2 state when deleting instance (#36034) 2016-09-02 14:14:29 -06:00
Sergey Kizunov
c59ab20a34 Fix Windows salt-master
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-02 14:43:26 -05:00
Nicole Thomas
f76dc0f9c0 Merge pull request #36026 from rallytime/merge-develop
[develop] Merge forward from 2016.3 to develop
2016-09-02 10:40:32 -06:00
rallytime
1bf840b036 Merge branch '2016.3' into 'develop'
No conflicts.
2016-09-02 09:43:40 -06:00
Mike Place
cd60ec5d57 Merge pull request #36024 from DSRCorporation/bugs/31454_local_client_memleak
Don't subscribe to events if not sure it would read them.
2016-09-03 00:41:01 +09:00
Nicole Thomas
32d5f896d4 Merge pull request #36023 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-09-02 09:37:59 -06:00
Dmitry Kuzmenko
01911c530e Don't subscribe to events if not sure it would read them.
Reactor uses LocalClient to send message but do not read events that
produces memory leak in EventPublisher: sent messages are collected
there in the IOStream class.
2016-09-02 17:20:30 +03:00