Commit Graph

69628 Commits

Author SHA1 Message Date
Dmitry Kuzmenko
ca8eb7e076 Don't run the same signal handler twice. Catch os.kill errors.
Else a Process Not Found error stops the killing loop and there are
still alive master subprocesses.
2016-09-09 15:27:20 +03: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
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
24bd03734d Merge pull request #36152 from cachedout/issue_36094
Remove unnecessary unpack
2016-09-09 18:13:46 +09: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
Nicole Thomas
3445a333d5 Remove unclosed backticks in walkthrough doc (#36170) 2016-09-08 15:49:01 -06:00
Nicole Thomas
24b0387b92 Back-port #36070 to 2015.8 (#36169) 2016-09-08 15:48:44 -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
David Boucha
116d7ac3e5 If windows pkg db hasn't been created yet, refresh the db instead of stacktracing (#36008)
* Don't raise an exception. Just return empty dict

If the repo cache file doesn't exist, lets' just return
an empty dict rather than raising an exception.

* If repo cache file doesn't exist, refresh

* add logging message

* remove unused imports
2016-09-08 10:57:57 -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
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
1f909038f0 Merge pull request #36139 from meaksh/tests-fixes-for-2016.3
Fixing unit tests for 2016.3
2016-09-08 22:20:21 +09:00
Mike Place
3eb3df55ad Merge pull request #36143 from multani/fix-doc-state-mount
doc: fix doc formatting for salt.states.mount
2016-09-08 22:11:03 +09:00
Mike Place
4cc8ea9577 Merge pull request #36146 from meaksh/tests-fixes-for-2015.8
Fixing unit tests for 2015.8
2016-09-08 22:10:36 +09:00
Pablo Suárez Hernández
52a7ed605e Fixed _interfaces_ifconfig output for SunOS test 2016-09-08 12:39:28 +01:00
Eric Radman
158bcbff65 Fix tests that assert CommandExecutionError (#32485)
Trying to assert that an exception was raised using
helper_open.write.assertRaises() is bogus--there is no such method. Use
standard unittest.assertRaises() instead.
2016-09-08 12:39:28 +01:00
Mihai Dincă
8b480167e1 Fix tests (#35693)
* Fix tests/unit/modules/useradd_test.py::UserAddTestCase::test_info

* Fix unit/pyobjects_test.py::MapTests::test_map

* Fix tests/unit/pyobjects_test.py::RendererTests::test_extend

* Fix tests/unit/pyobjects_test.py::RendererTests::test_requisite_implicit_list
2016-09-08 12:39:28 +01:00
Eric Radman
29814f9d43 Skip utils_test if timelib is not installed (#32699)
date_cast() throws a RuntimeError, not an ImportError
2016-09-08 12:39:28 +01:00
Pablo Suárez Hernández
d1d806f893 Fix PortageConfigTestCase in case of portage is not present 2016-09-08 12:39:28 +01:00
Pablo Suárez Hernández
1c260e4bd0 Fix tests to prevent errors when libcloud is not present 2016-09-08 12:39:28 +01:00
twangboy
9f9aa4779c rename darwin_sysctl.py to mac_sysctl.py 2016-09-08 12:28:18 +01:00
abednarik
2cf6f36d89 modules.darwin_sysctl: __virtual__ return err msg.
Updated message in darwin_sysctl module when return False if OS is not OSX.
2016-09-08 12:28:12 +01:00
Mike Place
f74ca15f50 Remove test for file dir behavior
Refs #34809
2016-09-08 11:36:17 +01:00
Eric Radman
c65aefee20 Fix tests that assert CommandExecutionError (#32485)
Trying to assert that an exception was raised using
helper_open.write.assertRaises() is bogus--there is no such method. Use
standard unittest.assertRaises() instead.
2016-09-08 11:36:17 +01:00
twangboy
f8c0b439b8 Fixed more lint 2016-09-08 11:36:17 +01:00
twangboy
63ff731009 Fixed tests 2016-09-08 11:36:17 +01:00
Dmitry Kuzmenko
04b1a4a9ca Fixed use of assert_has_calls in tests.
The method logic was changed in mock-1.1.0.
This mades the use of the method compatible with both <1.1.0 and >=1.1.0
2016-09-08 11:36:17 +01:00
Dmitry Kuzmenko
46e4bb58e5 Fixed LoadAuthTestCase 2016-09-08 11:36:17 +01:00
rallytime
4e9733ad6d Rename dockerio.py unit tests to dockerio_test.py
These tests have never run automatically because of an incorrect file name.

Added a skipIf on these tests as they are currently non-functioning and the
module they're testing has been deprecated.
2016-09-08 11:36:17 +01:00
Pedro Algarvio
ec0cc943e0 Make sure spm tests are picked up by runtests.
Lists in py2 don't have the clear method
2016-09-08 11:36:17 +01:00
kstreee
2605f34849 Fix missing first data in stream when subscribing stream using a function 'read_async'. 2016-09-08 11:36:17 +01:00
Pablo Suárez Hernández
305bab8be0 Fixed _interfaces_ifconfig output for SunOS test 2016-09-08 11:36:17 +01:00
Eric Radman
b5ca02c867 Fix tests that assert CommandExecutionError (#32485)
Trying to assert that an exception was raised using
helper_open.write.assertRaises() is bogus--there is no such method. Use
standard unittest.assertRaises() instead.
2016-09-08 11:36:17 +01:00
Mihai Dincă
1fb6340fef Fix tests (#35693)
* Fix tests/unit/modules/useradd_test.py::UserAddTestCase::test_info

* Fix unit/pyobjects_test.py::MapTests::test_map

* Fix tests/unit/pyobjects_test.py::RendererTests::test_extend

* Fix tests/unit/pyobjects_test.py::RendererTests::test_requisite_implicit_list
2016-09-08 11:36:17 +01:00
Eric Radman
5977f1f54c Skip utils_test if timelib is not installed (#32699)
date_cast() throws a RuntimeError, not an ImportError
2016-09-08 11:36:17 +01:00
Pablo Suárez Hernández
d1b9a4061e Fixing skipped boto tests to prevent errors if boto3 does not exists. 2016-09-08 11:36:17 +01:00
Jonathan Ballet
035a212a9b doc: fix doc formatting for salt.states.mount 2016-09-08 11:53:34 +02:00
Mike Place
1e8431f2b8 Allow highstate outputter to show all results
This regressed here: 82a70e015f

The above incorrect assumed that all data flowing into the highstate outputter is expected to be a dictionary. However, looking at _format_host() shows that it does expect to receive multiple types and does handle them accordingly.

I believe that the issue reported in #33915 may be fixed by #35559 instead. This should allow the highstate outputter to display all results instead of stopping after the first one. I would like @terminalmage and @mattglv and possibly @Ch3ll to please confirm this before we get this in.

Resolves #35423
2016-09-08 12:04:32 +09:00
Mike Place
c4ddfe3887 Merge pull request #35954 from morganwillcock/upgrade-on-batteries
win_pkg: Allow minion upgrade on batteries and report launch failure
2016-09-08 10:25:37 +09:00
Mike Place
70da628018 Merge pull request #36070 from rallytime/fix-36057
Use __utils__ instead of salt.utils.cloud in opennebula driver
2016-09-08 10:18:45 +09:00
Mike Place
b7556a2aeb Merge pull request #36089 from terminalmage/issue35565
Support running git states / remote exec funcs as a different user in Windows
2016-09-08 10:17:22 +09:00
Mike Place
94b7659304 Merge pull request #36129 from terminalmage/pygit2-ssl_verify
pygit2: Prevent traceback on initial gitfs setup
2016-09-08 10:03:25 +09:00
Erik Johnson
640f0c17c6 pygit2: Prevent traceback on initial gitfs setup
Newer pygit2 releases require that this value be a string, they will not
accept a bool here.
2016-09-07 17:12:05 -05:00
Nicole Thomas
7cdbc546f1 Back-port #36062 to 2015.8 (#36118)
* Comment all lines in the minion config file

* Add unit tests to check for all files in conf/ to be commented out

* Make sure cont/cloud.profiles file is commented out

Matches the cloud.providers file format and other sample config files.

* Add unit tests for sample files in cloud.profiles.d, cloud.providers.d,
and cloud.maps.d

* Make sure all sample config files in cloud.maps.d are commented out

* Make sure all sample config files in cloud.profiles.d are commented out
2016-09-07 16:01:34 -06:00
Erik Johnson
796156c5f5 Add attribution 2016-09-07 11:17:56 -05:00
twangboy
dc1988add5 fix download when requests not present 2016-09-07 09:59:51 -06:00
Erik Johnson
2e56527ead Move command logging to before win_runas
With the addition of runas for Windows in 2016.3.0, commands run using
Windows runas would not be logged at all, as we would return from the
_run() function before we got to the line where this information was
logged. This commit moves the command logging up to before we enter the
if block where the win_runas code would be executed, restoring the
prior logging behavior.
2016-09-07 10:36:13 -05:00