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
91,813 Commits 24 Branches 182 Tags 341 MiB
b96ce23b3f
Commit Graph

7802 Commits

Author SHA1 Message Date
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
5c4c0468ad
Fix regression in handling of environment/saltenv 
This was broken sometime between when the change was made and 2018.3.0
was released. This fixes the issue and adds a regression test.
 2018-04-13 13:44:55 -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
Gareth J. Greenaway
f2e484ed54
Merge branch '2018.3' into crptodomekeyfix 2018-04-12 08:12:00 -07: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
rallytime
590c7fc13f
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/state.py
  - salt/utils/files.py
  - tests/integration/modules/test_pip.py
 2018-04-11 12:41:22 -04:00
Nicole Thomas
8f994e7cf9
Merge pull request #46539 from jfoboss/patch-1 
#46504 Fix
 2018-04-11 10:13:23 -04: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
twangboy
19c3fadbe5
Fix unit test for win_ntp 2018-04-10 12:12:17 -06:00
Ch3LL
c01180ff47
Patch ZMQ versions for master_uri test 2018-04-10 13:02:57 -04:00
Ch3LL
e972ebdf1a
Add for new source_* minion options 2018-04-10 13:02:57 -04:00
Peter Morris
44ecd13abc Update tests to use cmd.run_all 2018-04-10 01:11:03 +01:00
Daniel A Wozniak
e1995a92ee
Fix verify signature test 
We load the key to memory first now so mocking salt.utils.fopen fixes
the signature verification test
 2018-04-09 09:41:32 -07:00
Daniel A. Wozniak
0ba32118d9
Add test for bad public key without m2crypto 2018-04-06 11:22:32 -07:00
Daniel A. Wozniak
a44c356233
Clean up bad public key headers 
Remove the "RSA" delaration from public key headers generated by
pycryptodome<=3.4.6
 2018-04-06 10:56:50 -07:00
rallytime
0a297e7319
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/grains/core.py
  - salt/utils/__init__.py
 2018-04-05 13:43:51 -04: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
Nicole Thomas
67894e3ee9
Merge pull request #46869 from gtmanfred/2018.3 
Always return dictionary for _localectl_status
 2018-04-05 09:25:13 -04:00
Nicole Thomas
18e460fc30
Merge branch '2017.7' into whitelisted_acl 2018-04-04 17:28:40 -04:00
Nicole Thomas
d7e4b9d755
Merge pull request #46729 from terminalmage/expr_match 
Performance improvement/error catching in expr_match
 2018-04-04 16:25:56 -04:00
Daniel Wallace
1496e985f7
fix pylint 2018-04-04 15:13:59 -05:00
Nicole Thomas
e0b383afb5
Merge pull request #46872 from terminalmage/bp-46863 
Backport #46863 to 2018.3
 2018-04-04 15:04:39 -04: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
be284e5b99
Add skipIf when older mock present 2018-04-04 10:54:47 -05:00
Erik Johnson
db8faaee56
Add unit tests for ext_nodes master_tops module 2018-04-04 10:53:08 -05:00
Daniel Wallace
75425dfd20
fix tests for localemod 2018-04-04 09:58:21 -05:00
rallytime
4ad50bbdee
Update old utils paths to new paths 2018-04-03 14:46:56 -04:00
rallytime
893196d3e6
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/conf.py
  - salt/loader.py
  - salt/modules/dockermod.py
  - salt/modules/sensehat.py
  - salt/utils/parsers.py
  - tests/integration/cloud/providers/test_ec2.py
  - tests/integration/modules/test_cp.py
  - tests/integration/modules/test_groupadd.py
  - tests/integration/spm/test_man_spm.py
  - tests/integration/states/test_npm.py
  - tests/unit/states/test_environ.py
 2018-04-03 14:33:11 -04:00
Nicole Thomas
ebf5dd276f
Merge pull request #46783 from twangboy/fix_46680 
Fix network.managed test=True on Windows
 2018-04-03 08:54:55 -04:00
Nicole Thomas
df26f2641e
Merge pull request #46675 from dwoz/inspectlib-tests 
Skip test when git symlinks are not configured
 2018-04-03 08:19:18 -04:00
twangboy
da5ce25ef3
Fix unit tests on Linux 2018-04-02 19:59:13 -06:00
Daniel A. Wozniak
d39f4852d8
Handle non-zero status exception 2018-03-29 14:39:40 -07:00
Daniel A. Wozniak
83c005802b
Handle cases where git can not be found 
Signed-off-by: Daniel A. Wozniak <dwozniak@saltstack.com>
 2018-03-29 14:39:29 -07:00
Nicole Thomas
395b7f8fdc
Merge pull request #46655 from dwoz/pyobjects-46350 
Fixing cleanUp method to restore environment
 2018-03-29 14:31:47 -04:00
Nicole Thomas
af45c49c42
Merge pull request #46632 from dwoz/file-recurse-36802 
Fix file.recurse w/ clean=True #36802
 2018-03-29 14:30:41 -04:00
Daniel A. Wozniak
44db77ae79
Fix lint errors and typo 2018-03-28 21:06:34 -07:00
Daniel A. Wozniak
5aabd442f2
Fix up import and docstring syntax 2018-03-28 20:54:35 -07:00
Erik Johnson
70cfafe299
Add test case 2018-03-28 13:48:44 -05:00
Nicole Thomas
14ab50d3f4
Merge pull request #46696 from dwoz/win_test_client 
Windows `unit.test_client` fixes
 2018-03-28 13:55:46 -04:00
Daniel A. Wozniak
62d64c9230
Fix missing import 2018-03-27 14:10:24 -07:00
rallytime
d0278345fc
Update old utils paths to new utils paths 2018-03-27 16:45:16 -04:00
rallytime
e312efb5e7
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/man/salt-api.1
  - doc/man/salt-call.1
  - doc/man/salt-cloud.1
  - doc/man/salt-cp.1
  - doc/man/salt-key.1
  - doc/man/salt-master.1
  - doc/man/salt-minion.1
  - doc/man/salt-proxy.1
  - doc/man/salt-run.1
  - doc/man/salt-ssh.1
  - doc/man/salt-syndic.1
  - doc/man/salt-unity.1
  - doc/man/salt.1
  - doc/man/salt.7
  - doc/man/spm.1
  - salt/modules/cmdmod.py
  - salt/modules/pillar.py
  - salt/modules/yumpkg.py
  - salt/state.py
  - salt/utils/pkg/rpm.py
  - salt/utils/schedule.py
  - tests/integration/states/test_npm.py
  - tests/integration/states/test_pkgrepo.py
 2018-03-27 16:31:55 -04:00