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
92,764 Commits 24 Branches 182 Tags 341 MiB
a46e42ab11
Commit Graph

1087 Commits

Author SHA1 Message Date
rallytime
3273bbdab7
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/modules/all/index.rst
  - doc/topics/grains/index.rst
  - doc/topics/releases/2016.3.4.rst
  - doc/topics/spm/spm_formula.rst
  - doc/topics/tutorials/cron.rst
  - doc/topics/tutorials/index.rst
  - doc/topics/tutorials/stormpath.rst
  - salt/engines/slack.py
  - salt/log/handlers/fluent_mod.py
  - salt/modules/cyg.py
  - salt/modules/junos.py
  - salt/modules/namecheap_dns.py
  - salt/modules/namecheap_domains.py
  - salt/modules/namecheap_ns.py
  - salt/modules/namecheap_ssl.py
  - salt/modules/namecheap_users.py
  - salt/modules/reg.py
  - salt/modules/tomcat.py
  - salt/modules/vault.py
  - salt/modules/win_file.py
  - salt/modules/zpool.py
  - salt/output/highstate.py
  - salt/renderers/pass.py
  - salt/runners/cache.py
  - salt/states/boto_apigateway.py
  - salt/states/boto_iam.py
  - salt/states/boto_route53.py
  - salt/states/msteams.py
  - salt/states/reg.py
  - salt/states/win_iis.py
  - tests/integration/modules/test_cmdmod.py
  - tests/integration/states/test_user.py
  - tests/support/helpers.py
  - tests/unit/cloud/clouds/test_openstack.py
  - tests/unit/fileserver/test_gitfs.py
  - tests/unit/modules/test_junos.py
  - tests/unit/pillar/test_git.py
  - tests/unit/states/test_win_path.py
  - tests/unit/test_pillar.py
  - tests/unit/utils/test_format_call.py
  - tests/unit/utils/test_utils.py
  - tests/unit/utils/test_warnings.py
 2018-06-01 14:54:12 -04:00
Erik Johnson
93ee5ee2b0
Fix all Sphinx warnings 
Well, all but one, which we expect to see
 2018-05-31 15:28:25 -05:00
Nicole Thomas
b860d95b2c
Merge pull request #47726 from gtmanfred/2018.3 
rename boto to botomod
 2018-05-25 16:37:36 -04:00
rallytime
1adb8ea27f
Merge branch '2018.3.1' into '2018.3' 
No conflicts.
 2018-05-22 17:14:31 -04:00
Daniel Wallace
7e30f459c9
rename boto to botomod 2018-05-22 12:49:47 -05:00
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
Erik Johnson
d612bd27e4
Move/merge more test modules 
This moves mislocated tests to their proper locations to match the files
they test, merging tests into existing modules where necessary.
 2018-05-10 14:53:52 -05: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
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
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
Ch3LL
58c4f29f96
Fix 47364: ensure we are not caching zfs.is_supported 2018-05-07 13:55:21 -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
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 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
94a70e847a
Ignore gitfs tests when symlinks not enabled 2018-04-26 23:51:28 -07:00
David Murphy
3f30ab2ed6 ZFS backport of 46933 to 2018.3.1 2018-04-19 12:08:58 -06:00
Erik Johnson
048728d2b7
Remove unused imports 2018-04-18 19:46:32 -05:00
Erik Johnson
879c557264
Use decorators for temp files/dirs in test suite 
This adds a new decorator which creates a temporary directory and cleans
it after the test completes. It also modifies an existing decorator for
creating temporary files so that it accepts arguments, which will be
passed through to salt.utils.files.mkstemp().
 2018-04-18 19:46:29 -05:00
Nicole Thomas
b96ce23b3f
Merge pull request #47104 from terminalmage/issue46929 
yamlloader: Properly handle colons in inline dicts
 2018-04-18 12:22:46 -04:00
Mike Place
ee90dd5d95
Merge branch '2018.3' into issue46909 2018-04-16 16:59:25 -06:00
Erik Johnson
33bf6643cd
Add additional test for plain scalars 2018-04-16 12:17:20 -05:00
Erik Johnson
508659b682
yamlloader: Properly handle colons in inline dicts 
PyYAML's scanner is not written to handle Python's unicode literal
strings, since they are not part of the YAML spec. With all strings
loaded in the YAML context now being unicode types, this causes errors
when scanning the document to construct the next node. The unicode
string literal is misidentified as a plain scalar and any colons within
it are interpreted as delimiting a mapping node. Since no whitespace appears
after the colon, this causes scanning error.

To fix it, we check for this scanning error and reset the scanner's
position and check if the first char is the "u" prefix. If so, and if
the following char is a quote, then we attempt to scan for a string
literal instead.
 2018-04-16 11:29:51 -05:00
Erik Johnson
5d98a8bedd
Make salt.utils.stringutils.to_binary work for bytestrings 
Also make sure we're testing bytestring equivalents to each of the
strings in the test.
 2018-04-12 22:12:48 -05:00
Mike Place
ac2d54d78a
Merge pull request #47029 from terminalmage/issue46859 
ldapmod.py/ldap3.py: Force modlist for search/modify/etc. to be str types
 2018-04-12 13:41:28 -06:00
Erik Johnson
7691dee4ed
Add to_str option to decode funcs 
This allows for the string to be forced to a str type instead of
unicode on PY2.
 2018-04-11 14:41:54 -05:00
twangboy
5796696617
Fix tests for Py3 
readPlistFromString has been deprecated on Python3. Use loads instead.
 2018-04-10 14:45:32 -06:00
twangboy
781880f0fc
Add _available_services function for testing 2018-04-10 14:45:31 -06:00
twangboy
6080633613
Add assert_called_with 2018-04-10 14:45:31 -06:00
twangboy
1bf70b2033
Add more tests for available_services 2018-04-10 14:45:30 -06:00
twangboy
b429fc3e74
Add tests for mac_utils 
Need help with the `available_services` tests
 2018-04-10 14:45:30 -06:00
Mike Place
4e5e291c99
Merge pull request #46873 from terminalmage/utf8-first 
Attempt UTF-8 first when decoding/encoding
 2018-04-05 09:16:27 -05:00
Erik Johnson
f59cee28db
Remove hacky workarounds to get encode/decode tests to pass on Windows 2018-04-04 13:18:04 -05:00
Erik Johnson
70cfafe299
Add test case 2018-03-28 13:48:44 -05:00
twangboy
5ee64e9b0e
Fix lint (spelling error) 2018-03-26 13:02:53 -06:00
twangboy
0de54ed953
Additional tests 
Adds additional tests for unicode scenarios
Fixes an issue with reg.py when deleting unicode keys
Puts the destructive tests in a try/except block so the delete occurs no
matter what
Uses a randomly generated key name for testing
 2018-03-22 15:59:46 -06:00
twangboy
e0d201a96f
Make sure the docs are correct for the tests 2018-03-22 14:29:34 -06:00
twangboy
f15f92318d
Add tests for salt.utils.win_reg 
Fix some issues found in testing
 2018-03-22 14:29:34 -06:00
Mike Place
2e1f7c37f7
Merge pull request #46569 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-03-21 20:57:04 +00:00
rallytime
b03cda3cea
Merge branch '2018.3.0rc1' into '2018.3' 
No conflicts.
 2018-03-20 09:13:13 -04:00
rallytime
8d1e1e7f94
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - .kitchen.yml
  - Gemfile
  - pkg/windows/build_env_2.ps1
  - pkg/windows/build_env_3.ps1
  - pkg/windows/req.txt
  - salt/client/ssh/__init__.py
  - salt/client/ssh/ssh_py_shim.py
  - salt/modules/boto_vpc.py
  - salt/modules/file.py
  - salt/modules/heat.py
  - salt/modules/smartos_vmadm.py
  - salt/modules/win_dsc.py
  - salt/returners/elasticsearch_return.py
  - salt/runners/salt.py
  - salt/states/module.py
  - salt/utils/win_functions.py
  - setup.py
  - tests/integration/modules/test_state.py
  - tests/unit/grains/test_core.py
  - tests/unit/test_pillar.py
 2018-03-15 17:22:05 -04:00
Erik Johnson
a8b1f0d640
Add unit test for salt-ssh edge case 2018-03-13 13:39:27 -05:00
Nicole Thomas
7cdb00ca9c
Merge pull request #46398 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-03-12 16:25:18 -04:00
Benjamin Drung
3d37eca847 Fix various spelling mistakes 
lintian found various spelling mistakes.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-03-08 19:14:42 +01:00
Benjamin Drung
a3c54b50f6 Fix various spelling mistakes 
lintian found various spelling mistakes.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-03-08 15:25:42 +01:00