Commit Graph

8785 Commits

Author SHA1 Message Date
Ch3LL
60724980ec
fix test_fstype test for mac 2017-04-13 12:04:20 -04:00
Mike Place
92b5f03beb Merge pull request #40551 from terminalmage/issue39868
Fix four issues in archive.extracted state
2017-04-12 12:37:51 -06:00
Daniel Wallace
b0bd99c26d add comment and unit test 2017-04-11 21:08:06 -06:00
Erik Johnson
5ea1f607b0 Fix mocking in unit tests 2017-04-10 13:57:39 -05:00
rallytime
5a419b8aae Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/modules/pillar.py
2017-04-07 11:23:41 -06:00
Erik Johnson
f8bc423ef9 Merge pull request #40563 from terminalmage/merge-2016.3-2016.11
Merge-forward 2016.3 -> 2016.11
2017-04-07 10:08:19 -05:00
Erik Johnson
0c608d7417 Add client_args_mock back to test
I removed this incorrectly in resolving a merge conflict.
2017-04-07 08:50:45 -05:00
Mike Place
83f6d3d3bb Merge pull request #40567 from terminalmage/fix-pillar-get-merge-lists
Allow pillar.get to merge list as well as dictionaries
2017-04-06 15:54:16 -06:00
Nicole Thomas
ae13de622a Merge pull request #40451 from isbm/isbm-fileclient-testcase-2016.11
Fileclient testcase (2016.11)
2017-04-06 13:53:30 -06:00
Erik Johnson
cb4db56eb5 Allow pillar.get to merge list as well as dictionaries
This also gets rid of the exception that used to be raised when the
default was not of the proper type, and instead skips merging in those
cases.
2017-04-06 12:24:22 -05:00
Erik Johnson
a6d68f50fe Merge remote-tracking branch 'upstream/2016.3' into merge-2016.3-2016.11 2017-04-06 10:15:47 -05:00
Bo Maryniuk
aba94495a5 Lintfix (Py3 code compat) 2017-04-05 22:56:29 +02:00
Ch3LL
7710355e3a
check for salt install fail on vultur test 2017-04-05 14:39:31 -06:00
Erik Johnson
78b4798b1b Update compile_template test to use StringIO 2017-04-04 15:41:43 -05:00
Erik Johnson
a6183d93d3 Preserve windows newlines in salt.template.compile_template()
Test included.
2017-04-04 15:41:43 -05:00
Mike Place
8da27c9e1d Merge pull request #40306 from terminalmage/issue40279
Don't use context caching for gathering systemd services
2017-04-04 14:36:38 -06:00
Mike Place
0ed385210f Merge pull request #40465 from rallytime/fix-37699
Artifactory Execution & State Module: Fixup Error Handling
2017-04-04 14:12:21 -06:00
rallytime
ede4c28887 Group checks for failhard setting in () in state.check_failhard function
Fixes #38683

When two states combine the `require`, `failhard`, and `order` options,
the `order` option should be ignored because `require` is present. Then
the `failhard` option should make the state run fail.

The check for "failhard" in the `check_failhard` function in the state
compiler was too broad. We want "failhard" to be true AND tag to be in
the `running` dict. Without the parens around the first OR statement,
we were bypassing the AND requirement because failhard was found.

Since the second state's tag was not found in the running dict, the state
run stacktraces on a KeyError.
2017-04-03 14:41:54 -06:00
Erik Johnson
1e2a04cfc5 Backport auth and custom registry fixes from #40480 to 2016.3 branch 2017-04-03 13:20:53 -05:00
rallytime
8f084f7056 Update unit test to look for actual string comment 2017-03-31 15:34:24 -06:00
Mike Place
fdb0250c95 Merge pull request #40429 from DSRCorporation/features/39275_memcache
MemCache - a minion data cache booster.
2017-03-31 14:20:59 -06:00
Dmitry Kuzmenko
4475d1757d In-memory minion data cache. 2017-03-31 19:38:04 +03:00
rallytime
0da4c46b68 Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/utils/__init__.py
  - salt/utils/gitfs.py
  - tests/unit/modules/ssh_test.py
2017-03-31 09:59:59 -06:00
Bo Maryniuk
9f9dc6e4e7 Add unit test case for fileclient 2017-03-31 13:40:36 +02:00
Mike Place
c26f4cc76c Merge pull request #40371 from terminalmage/pr-40344
Fix path handling for masterless gitfs on Windows
2017-03-30 16:36:20 -06:00
Mike Place
132d8b7b88 Merge pull request #40376 from nmadhok/2016.11
Backporting changes in vmware cloud driver from develop branch to 2016.11 branch
2017-03-30 16:35:12 -06:00
Dheeraj
77a40a0c44 Lint fixes 2017-03-30 10:31:16 +05:30
Dheeraj
8c1adfafd5 More complete fix for 39692
The existing fix did not work if the profile name itself had a dash `-`.
For example - `virtual-guest`. This commit fixes that by using `split('- ')`
rather than `split('-')`. This commit also provides two simple tests for the
`list_()` function to emulate behaviour of both old and new tuned-adm versions

Fixes #39692
2017-03-30 10:31:16 +05:30
Nitin Madhok
dd62310941 Adding unit tests for vmware_test 2017-03-30 00:54:57 -04:00
Nitin Madhok
034ef30f7c Remove old vmware unit tests 2017-03-30 00:53:09 -04:00
rallytime
99c8dcc18e Handle AttributeError for dockerng_mod.docker attempt fails and docker is installed
When we hit that attribute error, we need to set the docker version
variable to a tuple starting with 0 so we can use it in other test
comparisons. If docker is installed, but at a lower version, we will
see this attribute error.

Fixes the test failure on the 2016.11 branch on CentOS 6 VMs.
2017-03-29 10:28:51 -06:00
rallytime
96259d6c63 Lint fix 2017-03-28 17:12:56 -06:00
Nicole Thomas
2febd05896 Merge pull request #40372 from zer0def/pip-cache-fixes
Fixes related to cache directory argument changes in pip>=6.
2017-03-28 16:48:40 -06:00
rallytime
4f7ac1431e Create a unit test for the _replace_auth_key function in the ssh module
References Pull Request #39855
2017-03-28 16:27:53 -06:00
Erik Johnson
cafa08d8e0 Add ability for salt.utils.path_join to force the use of posixpath
Also remove unused and unnecessary behavior from this function when the
first path component is of single length. An empty first parameter to
this function will normalze to "." and result in an incorrectly-joined
result.
2017-03-28 14:18:29 -05:00
Mike Place
2d2cb5b837 Merge pull request #40333 from gtmanfred/2016.11
fix some test=True comments
2017-03-28 10:11:00 -06:00
Erik Johnson
808ad76419 systemd.py: when getting all services, don't repeat gathering of systemd services
Now that we are not caching these in the context dunder, we should pass
them into this function so that we don't repeat gathering the systemd
services inside _get_sysv_services().

Also, this fixes an incorrect change to the mocking that was apparently
made at some point to the get_all unit test.
2017-03-28 10:52:50 -05:00
zer0def
d68067f1d7 Merge remote-tracking branch 'main/2016.11' into pip-cache-fixes 2017-03-28 16:39:19 +02:00
zer0def
4f23a23ca8 Fixed the test_install_download_cache_argument_in_resulting_command to accomodate introduced cache directory argument fixes and renamed it to test_install_download_cache_dir_arguments_in_resulting_command. 2017-03-28 11:53:54 +02:00
Daniel Wallace
5596620dfb fix some test=True comments
Alternatives should say it is setting the symlink to `path` instead of
`current` which it is already set to

ssh_auth.absent should say it is going to remove the key, unless the status is
set to `add`, then it is already absent

Fixes #40322
Fixes #40321
2017-03-27 18:19:52 -05:00
Mike Place
2b7b2f1cb4 Merge pull request #40285 from rallytime/docker-test-fixes
Dockerng unit tests fixes: isolate global variables
2017-03-27 17:05:02 -06:00
Mike Place
ceba1b9bc6 Merge pull request #40337 from Ch3LL/add_unzip_test
Add archive.extracted with use_cmd_unzip argument
2017-03-27 15:00:22 -06:00
rallytime
0f263a52e0 Mock out the get_client_args mocks in the dockerng module tests more aggressively
The tests pass fine when run independently, but when the full unit test suite
runs, the dockerng state tests are setting global values. This change makes the
module tests avoid those problem by relying on its own mocks.
2017-03-27 11:27:52 -06:00
Ch3LL
8b21b4c8bb add use_cmd_unzip test 2017-03-27 10:32:27 -06:00
rallytime
c65d602f60 Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/cli/batch.py
2017-03-24 17:11:49 -06:00
Pablo Suárez Hernández
9174e6f281 Fixes testing opts dict for batch unit tests 2017-03-24 17:22:57 +00:00
rallytime
f1352fe253 Add one more dockerng.version mock that was missed previously 2017-03-24 10:57:12 -06:00
rallytime
0d31d2c4d1 Add a couple more patches for docker.version information 2017-03-23 12:57:46 -06:00
rallytime
a9c5eebaf0 Clean up dockerng unit tests to avoid global variables and fixup some patching 2017-03-23 12:44:57 -06:00
Mike Place
e9a4e8548b Merge pull request #40210 from rallytime/test-skip
Skip flaky test for now
2017-03-22 10:34:40 -06:00