Commit Graph

81448 Commits

Author SHA1 Message Date
Daniel Wallace
c038727a80 document clouds dynamic directory 2017-05-07 20:30:20 -06:00
Erik Johnson
ffe4bc3d5c update unit test to reflect new behavior 2017-05-06 01:29:49 -05:00
Erik Johnson
482a5e341d Merge branch 'L4rS6-fix-file-blockreplace-diff-in-test-mode' into 2016.11 2017-05-06 01:29:46 -05:00
Erik Johnson
505cb45722 Merge branch 'fix-file-blockreplace-diff-in-test-mode' of https://github.com/L4rS6/salt into L4rS6-fix-file-blockreplace-diff-in-test-mode 2017-05-06 01:29:18 -05:00
Erik Johnson
2af89beb53 Merge pull request #41103 from lorengordon/win.get_route
Adds a get_route() function to win_network.py
2017-05-06 01:19:41 -05:00
Erik Johnson
8f79b6f537 Merge pull request #41090 from bbinet/rdurations_float
rdurations should be floats so that they can be summed when profiling
2017-05-06 01:18:40 -05:00
Erik Johnson
92011dbe5f Fix "latest" keyword for version specification when used with aggregation
The "latest" keyword was only implemented when both "name" and "version"
were used, and not for "pkgs". But mod_aggregate puts all packages into
a single low chunk, within "pkgs". This means that using aggregation in
conjuntion with the "latest" keyword no longer resolves the latest
version and thus breaks these states.

This fixes the problem by moving the logic for resolving the "latest"
keyword into _find_install_targets(). It also makes some improvements to
the logic we use to ensure only one package DB refresh is performed per
Salt run, by making the pkg.refresh_db functions handle removing the
rtag file, instead of requiring a call to a helper function everywhere
in the pkg state where we might be calling a function that refreshes the
package DB.
2017-05-06 00:46:06 -05:00
rallytime
16b4b9eb43 Make sure "version" exists before looking for pkg key
Fixes the test failure happening on the SUSE Leap build in the nitrogen
branch.

Version can be an empty dictionary and pass the check, but then we hit
a key error on the next line. Let's avoid that.

This failure was caused by the changes in #41086.

Fixes https://github.com/saltstack/salt-jenkins/issues/332
2017-05-05 16:29:56 -06:00
twangboy
46c3f23800 Fix allow paths tuple 2017-05-05 16:22:29 -06:00
Erik Johnson
8c6410e3cd Add notices about ssl_verify only working in 0.23.2 and newer 2017-05-05 17:04:23 -05:00
Erik Johnson
98ce829729 Support ssl_verify in pygit2 2017-05-05 16:58:13 -05:00
Erik Johnson
f73c4b7167 Add http(s) auth config docs for GitPython 2017-05-05 16:56:01 -05:00
Loren Gordon
93ce5644ea Adds test for win_network.get_route 2017-05-05 17:32:50 -04:00
twangboy
937d38bdee Add exeptions to path safety check 2017-05-05 14:48:40 -06:00
Daniel Wallace
83057d0f0f don't pass jid to list_jobs 2017-05-05 14:32:08 -06:00
rallytime
6e857681d4 Add calls to salt.client.get_local_client to patches list in auth unit tests
We need to mock the calls to `salt.client.get_local_client` in the
tests.unit.test_auth.py file. Without these mocks, there are many tests
that fail when the entire set of unit tests runs. (Specifically, these fail
with both the module and state boto_apigateway unit tests run.)

This mocked patch is similar to the change in PR #41082 and fixes all 16 test
failures reported in https://github.com/saltstack/salt-jenkins/issues/326.
2017-05-05 14:26:54 -06:00
Loren Gordon
b9cbbc0290 Adds a get_route() function to win_network.py
Returns the same data as the get_route() function in the network.py
execution module.
2017-05-05 16:19:11 -04:00
rallytime
43e2367fe2 Update str.split call in boto_apigateway module
The previous way of calling `str.split(path, '/')` was causing a
TypeError in the test runs of the boto_apigateway state and
module unit tests. Switching this to `path.split('/')` instead
avoids this type of error.

```
Traceback (most recent call last):
  File "/testing/tests/unit/states/test_boto_apigateway.py", line 584, in test_present_when_stage_is_to_associate_to_new_deployment
    **conn_parameters)
  File "/testing/salt/states/boto_apigateway.py", line 310, in present
    authorization_type=authorization_type)
  File "/testing/salt/states/boto_apigateway.py", line 1660, in deploy_resources
    **self._common_aws_args)
  File "/testing/salt/modules/boto_apigateway.py", line 358, in create_api_resources
    path_parts = str.split(path, '/')
TypeError: descriptor 'split' requires a 'str' object but received a 'unicode'
```
2017-05-05 13:42:09 -06:00
Nicole Thomas
2f9b5a4074 Merge pull request #41098 from rallytime/bp-41088
Back-port #41088 to 2016.11
2017-05-05 13:04:02 -06:00
Nicole Thomas
2123001f32 Merge pull request #41097 from rallytime/bp-41079
Back-port #41079 to 2016.11
2017-05-05 13:03:42 -06:00
Nicole Thomas
1930616d89 Merge pull request #41094 from rallytime/merge-nitrogen
[nitrogen] Merge forward from 2016.11 to nitrogen
2017-05-05 13:03:06 -06:00
rallytime
31887bc735 Merge branch '2016.11' into 'nitrogen'
No conflicts.
2017-05-05 11:23:15 -06:00
Nicole Thomas
ff6fa2b120 Merge pull request #41093 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2017-05-05 11:22:08 -06:00
Super-User
dc6cd2ea45 Fix docs for zfs state module 2017-05-05 10:59:12 -06:00
Brad Davis
845b49c304 Remove and extra colon that is causing rendering issues 2017-05-05 10:57:38 -06:00
rallytime
bb1917243e Merge branch '2016.11' into 'nitrogen'
No conflicts.
2017-05-05 10:11:11 -06:00
rallytime
a670eaa1db Merge branch '2016.3' into '2016.11'
No conflicts.
2017-05-05 10:08:04 -06:00
Mike Place
127eb04ff6 Merge pull request #41082 from rallytime/fix-spm-unit-tests
Patch calls to salt.client.Caller and salt.client.get_local_client in spm unit tests
2017-05-05 10:05:43 -06:00
Erik Johnson
247400c44e Merge pull request #41083 from rallytime/git-state-fix
Git state: head_ref should be head_rev in "latest" function
2017-05-05 10:52:20 -05:00
Nicole Thomas
bae17ed4b9 Merge pull request #41085 from Ch3LL/fix_azure
Fix azure tests to query provider
2017-05-05 09:49:58 -06:00
Nicole Thomas
f4eaa8e44a Merge pull request #41086 from twangboy/fix_test_pkg
Fix test pkg
2017-05-05 09:49:16 -06:00
C. R. Oldham
a4f7aa145e Look for libcrypto in both /opt/tools and /opt/local on Illumos-based distros. 2017-05-05 09:04:35 -06:00
Bruno Binet
fd48a63653 rdurations should be floats so that they can be summed when profiling 2017-05-05 12:04:34 +02:00
twangboy
cc3f2d0c31 Fix some indenting issues 2017-05-04 16:51:29 -06:00
twangboy
019dc5f966 Fix some logic in _get_msiexec 2017-05-04 16:49:20 -06:00
twangboy
e4c5156d77 Fix some lint 2017-05-04 16:45:58 -06:00
Nicole Thomas
4c2e636cd1 Merge pull request #41084 from rallytime/disable-matcher-test-arch
Skip the test_salt_documentation_arguments_not_assumed test for Arch
2017-05-04 15:56:28 -06:00
twangboy
20da5f5d4b Add software def for putty 2017-05-04 15:16:21 -06:00
twangboy
75072b1c83 Fix pkg tests for windows 2017-05-04 15:13:41 -06:00
Ch3LL
1eda73bd61
fix azure tests to query provider 2017-05-04 16:50:24 -04:00
rallytime
da811fe505 Skip the correct test for the matcher tests in Arch
I mixed up the test that was actually failing for Arch. I originally
submitted #41074 to skip the test_salt_documentation test in the
shell matcher tests. This is the wrong test to skip.

I reverted the previous commit, and applied the skipTest to the
correct test that is failing on Arch, which is the
test_salt_documentation_arguments_not_assumed test.
2017-05-04 14:45:58 -06:00
rallytime
b9d1ce9aed Revert "Skip integration.shell.matcher.MatchTest.test_salt_documentation test for Arch"
This reverts commit 9eb482d5c7.
2017-05-04 14:45:38 -06:00
rallytime
b85ee48ff4 Git state: head_ref should be head_rev in "latest" function
The "head_ref" variable is not used anywhere in the code, and should
be "head_rev" instead. Without setting "head_rev" to "None", there is
a potential to hit an UnboundLocalError further down in the file.

This was caught by a test in the nitrogen branch, but the bug is present
on 2016.11 as well. Here's the output from the integration test failure:
```
   -> integration.states.test_git.GitTest.test_latest_updated_remote_rev  .........................................
       Traceback (most recent call last):
         File "/testing/tests/integration/states/test_git.py", line 365, in test_latest_updated_remote_rev
           self.assertSaltTrueReturn(ret)
         File "/testing/tests/support/mixins.py", line 547, in assertSaltTrueReturn
           **(next(six.itervalues(ret)))
       AssertionError: False is not True. Salt Comment:
       An exception occurred in this state: Traceback (most recent call last):
         File "/testing/salt/state.py", line 1822, in call
           **cdata['kwargs'])
         File "/testing/salt/loader.py", line 1727, in wrapper
           return f(*args, **kwargs)
         File "/testing/salt/states/git.py", line 727, in latest
           if head_rev is not None:
       UnboundLocalError: local variable 'head_rev' referenced before assignment
```
2017-05-04 14:39:15 -06:00
Mike Place
1179720327 Merge pull request #41069 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2017-05-04 14:34:57 -06:00
rallytime
891e174f71 Patch calls to salt.client.Caller and salt.client.get_local_client in spm unit tests
Fixes the spm unit test failures in CentOS 6. These calls to the client need to be
patched so they don't interact with other unit tests.
2017-05-04 14:30:49 -06:00
Nicole Thomas
9d638abc62 Merge pull request #41074 from rallytime/disable-matcher-test-arch
Skip integration.shell.matcher.MatchTest.test_salt_documentation test for Arch
2017-05-04 13:26:16 -06:00
Nicole Thomas
21574ea543 Merge pull request #41076 from rallytime/merge-nitrogen
[nitrogen] Merge forward from 2016.11 to nitrogen
2017-05-04 13:02:59 -06:00
Nicole Thomas
72c854d9ac Merge pull request #41078 from Ch3LL/add_2016.11.5_release
Add 2016.11.5 release notes and change log
2017-05-04 13:00:57 -06:00
Ch3LL
96ed815687
Add 2016.11.5 release notes and change log 2017-05-04 14:16:18 -04:00
rallytime
c91bb18298 Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - doc/ref/configuration/master.rst
  - salt/modules/pip.py
  - salt/states/saltmod.py
2017-05-04 11:49:33 -06:00