Nicole Thomas
3614d3d83a
Merge pull request #47727 from Ch3LL/spelling
...
Fix salt.utils.versions.warn_until spelling
2018-05-21 09:40:59 -04:00
Ch3LL
ee90c779a8
mac_utils test: patch __salt__['cmd.run*']
2018-05-18 16:48:48 -04:00
Ch3LL
47a8de5b73
Fix salt.utils.versions.warn_until spelling
2018-05-18 11:59:45 -04:00
Daniel A. Wozniak
1d9f247fb7
Default windows to m1.small for ec2-classic
2018-05-18 09:20:08 -04:00
Nicole Thomas
fb3bf1ff3e
Merge pull request #47664 from rallytime/bp-47645
...
Back-port #47645 to 2018.3.1
2018-05-15 14:25:27 -04:00
Ch3LL
0a732d8e66
query the pip path for test test_issue_2087_missing_pip
2018-05-15 13:17:54 -04:00
Daniel A. Wozniak
7214fe17c8
Fix typo
2018-05-14 15:52:41 -04:00
Daniel A. Wozniak
b6a21dfda3
use ignore-undefined-variable
2018-05-14 15:52:30 -04:00
Daniel A. Wozniak
2429f9fe8a
Ignore pylint WindowsError
2018-05-14 15:52:26 -04:00
Daniel A. Wozniak
2d63682fea
Better doc string
2018-05-14 15:52:22 -04:00
Daniel A. Wozniak
ec2adff699
Skip tests when we can not use runas
2018-05-14 15:52:17 -04:00
Ch3LL
0763f96458
update salt.utils.platform path for virt core test
2018-05-09 18:02:17 -04:00
Ch3LL
718252c1ef
Update salt.utils.path mock in virtual core test
2018-05-09 13:24:39 -04:00
Nicole Thomas
fe4e79f1de
Merge pull request #47518 from Ch3LL/zfs_support
...
Fix 47364: ensure we are not caching zfs.is_supported
2018-05-09 09:29:06 -04:00
Nicole Thomas
332e9f13a6
Merge pull request #47159 from terminalmage/whitelist_blacklist-iter-fix
...
Fix for whitelist/blacklist checking for non-list iterables
2018-05-08 16:43:50 -04:00
Nicole Thomas
21809ddc02
Merge pull request #47514 from rallytime/merge-2018.3
...
[2018.3] Merge forward from 2017.7 to 2018.3
2018-05-08 14:36:53 -04:00
Ch3LL
d19fef963e
remove unnecessary patch in zfs.is_supported test
2018-05-08 12:14:37 -04:00
Erik Johnson
ca936de372
Treat empty whitelist/blacklist as no whitelist/blacklist
2018-05-08 10:24:21 -05:00
rallytime
e2616b605f
Update the pip tests to use the parsing syntax generated in PR #47196
2018-05-08 10:42:14 -04:00
Erik Johnson
bcccaf2621
Raise a TypeError when invalid input passed to check_whitelist_blacklist
2018-05-08 09:30:23 -05:00
Erik Johnson
2ae510ff2b
Fix comment in test
2018-05-08 09:30:23 -05:00
Erik Johnson
17398efcf7
Fix for whitelist/blacklist checking for non-list iterables
...
A recent PY3-compatibility fix was made to `check_whitelist_blacklist`.
The function was previously checking for the `__iter__` attribute to
check if the blacklist and/or whitelist was a sequence of expressions
or a single expression. However, the `str` type has the `__iter__`
attribute in PY3 while it does not in PY2. To fix this, the check was
changed to see if the blacklist and/or whitelist were `list` types. This
however causes problems in `salt.daemons.masterapi` when we pass `set`
types.
To fix this, we just check if the whitelist and/or blacklist are string
types, rather than that they are _not_ some sort of sequence type.
2018-05-08 09:30:21 -05:00
rallytime
2ad60c7e81
Lint: remove duplicate function in helpers.py
2018-05-07 15:45:30 -04:00
rallytime
e9cb080a00
Cleanup weird spaces
...
Some spaces between the `@` and the `skipIf` snuck into the branch
and the linter, nor the tests, caught this for some reason.
2018-05-07 14:51:39 -04:00
Ch3LL
58c4f29f96
Fix 47364: ensure we are not caching zfs.is_supported
2018-05-07 13:55:21 -04:00
rallytime
5565d5e9b1
Update old utils paths with new utils paths
2018-05-07 13:36:47 -04:00
rallytime
786076ac03
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- pkg/windows/modules/get-settings.psm1
- salt/modules/cmdmod.py
- salt/modules/pip.py
- salt/modules/win_lgpo.py
- salt/states/pip_state.py
- tests/integration/states/test_pip.py
- tests/support/helpers.py
- tests/unit/modules/test_pip.py
- tests/whitelist.txt
2018-05-07 13:17:01 -04:00
Mike Place
a4c2df8fb2
Merge pull request #47472 from terminalmage/hashutils
...
salt.utils.hashutils: Fix UnicodeEncodeError in several funcs
2018-05-07 08:31:06 -05:00
Daniel Wallace
1f91a85587
specify cache dir for pip install
2018-05-04 12:48:52 -05:00
Daniel Wozniak
d20ca15c5d
Merge pull request #47447 from dwoz/strv
...
Fix failing test due to windows console encoding
2018-05-04 09:41:29 -07:00
Erik Johnson
7266c9984d
salt.utils.hashutils: Fix UnicodeEncodeError in several funcs
...
Many funcs in this module only convert the input to bytes on Python 3
because the hashing and base64-encoding funcs used in this module
require bytes as input. However, on Python 2, to get bytes the input
will be coerced to a str type if it is a unicode type. This will result
in a UnicodeEncodeError when the unicode string contains non-ascii
characters.
This commit ensures that all input which is going to be encoded/hashed
is converted to a bytes type first, and also ensures that all
base64-encoded results are returned as a unicode string on Python 2 to
conform with changes that have been made in 2018.3 to use unicode types
where possible.
2018-05-04 11:13:29 -05:00
Daniel Wozniak
8c5b30b541
Merge pull request #47466 from dwoz/randbytes
...
bytes file that decodes the same utf-8 and cp1252
2018-05-04 08:54:23 -07:00
Nicole Thomas
da9871d36b
Merge pull request #47196 from twangboy/fix_47024
...
Fix issues with pip
2018-05-04 10:23:03 -04:00
Nicole Thomas
fa293f8fac
Merge pull request #47435 from rallytime/merge-2018.3
...
[2018.3] Merge forward from 2017.7 to 2018.3
2018-05-04 09:05:32 -04:00
Nicole Thomas
51d21afd4f
Merge pull request #47464 from dwoz/skiP_syslog_tests
...
Skip tests not applicable to windows
2018-05-04 09:04:37 -04:00
Daniel Wozniak
3219430dcc
Merge pull request #47456 from dwoz/sysname
...
Sysname returns text type
2018-05-03 19:57:49 -07:00
Daniel A. Wozniak
ca9393b7fb
Skip tests not applicable to windows
2018-05-03 19:55:46 -07:00
Daniel A. Wozniak
fd9bc06aab
bytes file that decodes the same utf-8 and cp1252
...
This replacement bytes file will decode with the same errors using
cp1252 ad utf-8. Both will fail to decode the 1st, 3rd and 4th bytes.
2018-05-03 15:36:43 -07:00
rallytime
be0731da5f
Add skipIfs back in for rest_tornado tests
...
These were removed in a downstream PR, #47415 , and are now failing again
in this merge forward.
I will contact the OP about addressing this in 2018.3 as these test failures
are not something I have been able to track down in a merge-forward PR.
2018-05-03 16:23:59 -04:00
Daniel A. Wozniak
8c01773833
Use the same non decodable bytes for all tests
2018-05-03 12:58:07 -07:00
Daniel A. Wozniak
983881a2a1
Add bytes that will not decode using cp1252
2018-05-03 12:28:38 -07:00
Daniel A. Wozniak
559ee1961f
Sysname returns text type
2018-05-03 09:16:21 -07:00
rallytime
fd98ee3dc1
Lint: Add missing blank line
2018-05-02 16:50:36 -04:00
Erik Johnson
3ab332ad0e
Update tests to reflect bugfix
2018-05-02 15:21:39 -05:00
rallytime
561718b20b
Update old is_windows utils path to new utils path
2018-05-02 15:04:53 -04:00
rallytime
a94cdf8a0d
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- salt/daemons/flo/zero.py
- salt/minion.py
- salt/pillar/pillar_ldap.py
- salt/transport/zeromq.py
- salt/utils/async.py
- salt/utils/zeromq.py
- tests/integration/modules/test_service.py
- tests/integration/netapi/rest_tornado/test_app.py
- tests/unit/fileserver/test_gitfs.py
- tests/unit/modules/test_pip.py
2018-05-02 15:00:40 -04:00
twangboy
14ee5537b9
Add @with_tempdir helper
...
Fix two state tests
Remove redundent tests
2018-05-02 12:17:36 -06:00
Mike Place
2f5fc4ecc5
Merge pull request #47399 from isbm/isbm-zeromq17-deprecationwarning-2017.7.2-v2
...
zeromq 17 deprecation warning backport from 2018.3 + tornado 5 fixes
2018-05-02 10:11:15 -05:00
Nicole Thomas
b14e974b5f
Merge pull request #47343 from Ch3LL/win_srv_test
...
Add additional service module integration tests and enable for windows
2018-05-02 09:39:45 -04:00
twangboy
6c3b5fa6fa
Fix typo
2018-05-01 16:28:48 -06:00
