Commit Graph

62551 Commits

Author SHA1 Message Date
Denys Havrysh
3f308d7694 postgres_extension: report changes when an extension was installed (#36335)
* postgres_extension: report changes when extension was installed or upgraded

* postgres_extension state: fix unit tests
2016-09-16 08:23:20 -06:00
Thomas S Hatch
d2a583bc22 Merge pull request #36337 from cachedout/conduct
SaltStack's code of conduct
2016-09-15 14:44:25 -06:00
Erik Johnson
ef128ad0b0 Return None when find_file identifies the path as a directory (#36342)
This fixes a traceback in the LocalClient when you try to use
cp.cache_file on a directory instead of a file.
2016-09-15 14:39:46 -06:00
Pablo Suárez Hernández
dc518c5340 Skip test_resize2fs if resize2fs does not exists (#36325) 2016-09-15 10:14:50 -06:00
Mike Place
2fb61b9c9f SaltStack's code of conduct 2016-09-16 00:32:01 +09:00
Mike Place
b9b8e45362 Merge pull request #36272 from terminalmage/improved-gitfs-logging
Improved gitfs/git_pillar error logging
2016-09-14 14:25:16 +09:00
Mike Place
abb6aacb4b Merge pull request #36277 from terminalmage/gitfs-check-key-path
salt.utils.gitfs: Check for existence of ssh keys
2016-09-14 14:22:37 +09:00
Erik Johnson
223a20e987 Improved gitfs/git_pillar error logging
This adds ``exc_info_on_loglevel`` kwargs to error logging when the
error is being logged within an ``except`` block, to aid in
troubleshooting.
2016-09-13 16:51:20 -05:00
Pablo Suárez Hernández
ed2d2bd331 Integration tests fixes for 2015.8 (#36262)
* Fixing integration tests if azure is not present

* Fixing integration tests failures if 'git' command is missing

Skip git state integration tests if 'git' does not exists
Prevent OSError if 'git' command not found during _git_version()
2016-09-13 15:24:06 -06:00
Erik Johnson
4fee18c820 salt.utils.gitfs: Check for existence of ssh keys
This adds a check for existence of the public and private keys, and
will raise an exception if they do not exist.

The git_pillar preflight checks have also been altered to try to init
the git_pillar repos, instead of just instantiating a GitPillar object.
This will cause invalid git_pillar configuration to keep the master from
starting up like we already do for gitfs.
2016-09-13 14:52:52 -05:00
Erik Johnson
297a12c387 Fix misspelling of "occurred" in log messages/exceptions (#36270) 2016-09-13 12:33:41 -06:00
Mike Place
931486ba35 Merge pull request #36096 from twangboy/update_setup
[WIP] Add additional required dll's for Windows
2016-09-13 16:45:33 +09:00
Mike Place
b0dd6ff5c8 Merge pull request #36244 from terminalmage/gen-back-bug
salt.fileserver.Fileserver: Don't try to split a list in _gen_back
2016-09-13 09:53:16 +09:00
Mike Place
dcc9380996 Merge pull request #36245 from terminalmage/roots-bug
roots backend: Don't include '.' or '..' in empty_dirs
2016-09-13 09:52:14 +09:00
Erik Johnson
75d4997b70 roots backend: Don't include '.' or '..' in empty_dirs 2016-09-12 16:09:46 -05:00
Erik Johnson
363b21fd9b salt.fileserver.Fileserver: Don't try to split a list in _gen_back
This fixes a bug which causes backends passed as a python list to be
converted to a ``str`` (specifically a ``unicode`` type in PY2) and then
split, resulting in a backend that will never match anything.

This only affects runner and Salt Python API usage in which the
"backend" param to fileserver runner funcs is passed as a Python list.
2016-09-12 15:43:39 -05:00
Pablo Suárez Hernández
fdf40907b7 Some unit tests fixes (#36227)
* Prevent tests failures if boto does not exists

* Prevent tests failure if /etc/fstab does not exists
2016-09-12 11:43:12 -06:00
Mike Place
4e9490eebe Merge pull request #36214 from vutny/postgres-extension-doc
`postgres_extension` state module: fix docstrings
2016-09-12 07:58:29 +09:00
Denys Havrysh
5fe548f043 postgres_extension state module: fix docstrings 2016-09-11 23:17:40 +03:00
Mike Place
5b7b96c0b7 Merge pull request #36205 from vutny/postgres-tablespace-doc
Add missing `maintenance_db` kwarg to `postgres_tablespace.present` doc
2016-09-11 18:14:14 +09:00
Denys Havrysh
78296b90d8 Add missing maintenance_db kwarg to postgres_tablespace.present docstring 2016-09-10 12:20:40 +03:00
Nicole Thomas
6a5f7cb346 Ignore states that do not have a numeric jid, i.e. 'req' (#36185) 2016-09-09 11:28:48 -06:00
t2b
d4628f3c6b Allow additional kwargs in states.dockerng.image_present (#36156)
Fixes #31513
2016-09-09 09:32:38 -06:00
Nicole Thomas
24b0387b92 Back-port #36070 to 2015.8 (#36169) 2016-09-08 15:48:44 -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
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
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
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
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
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
twangboy
dc1988add5 fix download when requests not present 2016-09-07 09:59:51 -06:00
twangboy
b4479bff5f Add additional required dll's 2016-09-06 17:36:38 -06:00