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,797 Commits 24 Branches 182 Tags 341 MiB
04753bf67c
Commit Graph

73797 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dmitry Kuzmenko
34cfd0112f Print errors to stdout in salt-key as it's done in salt and salt-run. 2016-09-08 12:43:13 +03:00
David Boucha
64a576fc6e add windows core grain test 2016-09-07 21:22:24 -06: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
977957862c Merge pull request #35665 from sthrasher/cherrypy-jobs-endpoint-speedup 
Speed up /jobs for salt-api when run under cherrypy.
 2016-09-08 10:31:03 +09:00
Mike Place
ac944de55f Merge pull request #35726 from guettli/develop 
set HAS_PSUTIL=False for old versions of psutils
 2016-09-08 10:30:16 +09:00
Mike Place
e83e5d3ce7 Merge pull request #35957 from llua/zypper_db 
Ignore IndexError in refresh_db() for zypper.py. Fixing #33963
 2016-09-08 10:26:42 +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
8f918c933c Merge pull request #36029 from felix-deschamps/patch-1 
Fix for 35681: sdb paths are truncated.
 2016-09-08 10:24:17 +09: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
b71b1ccdd7 Merge pull request #36058 from s-sebastian/develop 
Add functions to assign/unassign private IP addresses
 2016-09-08 10:21:44 +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
d08caafe9b Merge pull request #36110 from benediktwerner/fix-apache-module-suse 
Configuring Apache modules on SUSE systems
 2016-09-08 10:13:44 +09:00
Mike Place
956b5afa73 Merge pull request #36120 from mguegan/36112_bsd_shadow 
Fix retrieval of shadow password for OpenBSD (#36112)
 2016-09-08 10:12:25 +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
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
Mike Place
dcd993f91c Merge pull request #36130 from terminalmage/issue35876 
Make gitfs_env_whitelist and blacklist configurable per-remote
 2016-09-08 08:53:44 +09:00
Benedikt Werner
c9d0cdb2c8 Adjusted os_family name and removed unused import 
Changed os_family name from Suse to SUSE and removed unused `import os`
 2016-09-08 01:08:53 +02: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
Erik Johnson
72c13d3825 Make gitfs_env_whitelist and blacklist configurable per-remote 
Resolves #35876.
 2016-09-07 17:10:46 -05:00
Valentin Rosavitskiy
bcee34d676 Add support for new OS VZ7 (#35123) (#36115) 2016-09-07 16:03:38 -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
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
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
Thomas S Hatch
845e96ad81 Merge pull request #36111 from cachedout/sighup 
Minion config reload support
 2016-09-07 13:54:39 -06:00