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
93,134 Commits 24 Branches 182 Tags 341 MiB
8fdd34d430
Commit Graph

8076 Commits

Author SHA1 Message Date
Daniel Wozniak
a5367eaf63
Merge pull request #47388 from dwoz/test_pip_fix 
Fix missing import
 2018-04-28 11:33:14 -07:00
Daniel A. Wozniak
eb26321e8b
Fix missing import 2018-04-28 10:29:30 -07:00
Daniel Wallace
37822c0cbb
Merge pull request #47384 from dwoz/test_pip_fix 
Fix py2 version of pip test
 2018-04-28 10:13:28 -05:00
Daniel A. Wozniak
a37a9da1fb
Fix py2 version of pip test 2018-04-28 02:24:39 -07:00
Daniel A. Wozniak
1570708fac
Close the repo and fix multiple tests 2018-04-28 01:32:02 -07:00
Daniel A. Wozniak
068f2d430d
Always sign and verify bytes 2018-04-27 16:20:18 -07:00
Daniel A. Wozniak
7810ebaba9
Add sign regression tests 2018-04-27 16:14:29 -07:00
Daniel A. Wozniak
f4441c3a1c
Adding regression test for 47124 2018-04-27 16:03:03 -07:00
Pedro Algarvio
4ae33c5d9a
Run off of a temporary config 2018-04-27 23:41:38 +03:00
rallytime
c7b73d132e
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-04-27 13:45:13 -04:00
rallytime
13e8124031
Merge branch '2017.7' into '2018.3' 
Due to the many merge conflicts created from #47106 against the 2017.7 branch
and #46002 against the 2018.3 branch, the changes from #47106 have been largely
removed from this merge forward and the HEAD of 2018.3 was taken.

A separate fix for Tornado 5.0 support will need to be made directly against the
2018.3 branch.

Conflicts:
  - doc/topics/development/conventions/formulas.rst
  - salt/master.py
  - salt/minion.py
  - salt/netapi/rest_tornado/saltnado.py
  - salt/states/zfs.py
  - salt/transport/ipc.py
  - salt/transport/tcp.py
  - salt/transport/zeromq.py
  - salt/utils/async.py
  - tests/support/helpers.py
  - tests/support/parser/cover.py
  - tests/unit/grains/test_core.py
  - tests/unit/modules/test_ssh.py
  - tests/unit/test_minion.py
  - tests/unit/utils/test_safe_walk.py
 2018-04-27 13:38:35 -04:00
Nicole Thomas
31db8ca7ad
Merge pull request #47347 from dwoz/test_mysql_fix_again 
Proper fix for mysql tests
 2018-04-27 13:27:52 -04:00
Daniel A. Wozniak
add78fb618
Fix linter warnings 2018-04-27 09:04:01 -07:00
Erik Johnson
37a13d8004
Update pip unit tests to reflect changes 2018-04-27 09:47:18 -05:00
Erik Johnson
7f86779be0
Lint fix 2018-04-27 09:18:53 -05:00
Daniel A. Wozniak
2644cc7553
Fix linter nits 2018-04-27 01:22:39 -07:00
Daniel A. Wozniak
799c601184
Proper fix for mysql tests 2018-04-27 00:22:50 -07:00
Daniel A. Wozniak
94a70e847a
Ignore gitfs tests when symlinks not enabled 2018-04-26 23:51:28 -07:00
twangboy
3e6e524eca
Fix some tests`` 2018-04-26 22:37:15 -06:00
Daniel Wozniak
dac04261b5
Merge pull request #47342 from dwoz/test_mysql_fix 
Fix mysql test cases
 2018-04-26 17:50:52 -07:00
Daniel A. Wozniak
7496f4c5a8
Fix mysql test cases 2018-04-26 15:42:46 -07:00
Daniel Wozniak
e4779f3246
Merge pull request #47339 from dwoz/ssh_key_test_fix 
Use salt.utils.fopen for line ending consistancy
 2018-04-26 15:39:55 -07:00
Daniel A. Wozniak
e37a93a1ca
Remove redundent close call 2018-04-26 13:47:11 -07:00
Daniel A. Wozniak
b2ae5889b7
Close the temporary file handle 2018-04-26 12:52:08 -07:00
Daniel A. Wozniak
9f7f83a975
Use salt.utils.fopen for line ending consistancy 2018-04-26 12:43:51 -07:00
Daniel A. Wozniak
dcb6a22c00
Remove un-needed string-escape 2018-04-26 11:28:25 -07:00
Nicole Thomas
44f19b2f94
Merge pull request #47113 from jfindlay/iptables_state 
Support proto for IPSec policy extension in iptables state
 2018-04-25 14:01:18 -04:00
Nicole Thomas
b7a6206330
Merge pull request #47302 from Ch3LL/dead_code 
Remove unnecessary code from core grains and add test
 2018-04-25 13:58:47 -04:00
Nicole Thomas
fff4f8c1a5
Merge pull request #47280 from gtmanfred/localectl 
make sure not to send invalid information
 2018-04-25 13:46:44 -04:00
Nicole Thomas
0d9d55e013
Merge pull request #47106 from DSRCorporation/bugs/tornado50 
Tornado50 compatibility fixes
 2018-04-25 11:32:36 -04:00
Ch3LL
daa68b4877
Add virtual grains test for core grains 2018-04-25 11:03:35 -04:00
Nicole Thomas
89daf4fdc7
Merge pull request #47060 from OrlandoArcapix/Issue47059-return_dict_from_state 
Return an empty dict for 'changes' instead of 'None'
 2018-04-25 10:55:23 -04:00
Daniel Wallace
7c212cbb2d
fix pylint 2018-04-25 08:59:25 -05:00
Daniel Wallace
6754787e8e
update localemod tests 2018-04-24 13:38:46 -05:00
Gareth J. Greenaway
a2a8d78cb0
Fixing status beacon tests. 2018-04-24 08:00:06 -07:00
Gareth J. Greenaway
c87d6cae23
Ensure the salt_proxy is returning the correct tuple when the configuration is valid. Update various beacon unit tests to ensure they are testing the results of the validate function for a True result. 2018-04-24 08:00:06 -07:00
Gareth J. Greenaway
bcdef641e8
Removing target and tgt_type from the cmdline that is passed along to Salt, the target is used else where and including it in the cmdline causes problem when it is passed along. Adding an additional test to ensure we are getting the right targt. 2018-04-23 20:14:51 -07:00
Mike Place
2ed4b38b02
Merge pull request #47142 from garethgreenaway/47047_passing_pillar_to_slack_aliases 
[2018.3] pillar and output formatting fixes to Slack engine
 2018-04-23 13:55:06 -06:00
Justin Findlay
8bd08012ee
modules,states.iptables support proto for policy ext 2018-04-23 12:33:47 -07:00
Benedikt Werner
0197c3e973
Fix pip test 2018-04-23 21:05:15 +02:00
Nicole Thomas
370feadbd2
Merge pull request #47186 from dmurphy18/zfs_backport_46933 
backport of issue 46933, updated ZFS handling to Salt 2018.3.x
 2018-04-23 10:07:05 -04:00
Benedikt Werner
34bf66c09f
Fix pip.installed with pip>=10.0.0 2018-04-21 13:08:08 +02:00
Pedro Algarvio
6706b3a2d1
Run off of a temporary config 2018-04-20 17:02:52 +01:00
rallytime
bee4948df1
Lint: use full path for event utils function 2018-04-20 09:35:33 -04:00
Orlando Richards
5378e4fd07 Update grafana_datasource test to check for empty dict being returned on no changes, rather than None 2018-04-20 10:04:30 +01:00
Gareth J. Greenaway
6f183e1d80
Initial commmit for unit/engines/test_slack_engine 2018-04-19 18:29:49 -07:00
rallytime
4718d31e53
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/config/__init__.py
  - salt/minion.py
  - salt/modules/pip.py
  - salt/states/pip_state.py
  - salt/states/virtualenv_mod.py
  - tests/integration/modules/test_status.py
 2018-04-19 17:15:20 -04:00
Nicole Thomas
1947ffdf56
Merge pull request #47122 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-04-19 16:44:17 -04:00
Nicole Thomas
291cca7ed8
Merge pull request #47162 from terminalmage/bp-47161 
Partial backport of #47161 to 2018.3 branch
 2018-04-19 15:28:46 -04:00
David Murphy
3f30ab2ed6 ZFS backport of 46933 to 2018.3.1 2018-04-19 12:08:58 -06:00
rallytime
878fa06134
Test fix: remove tornado testing lib from class 
This use in the test class causing a failure in this branch that doesn't occur
in the 2017.7 branch. This tornado lib is also not necessary for this particular
test class.

This might cause a failure in the windows tests, but I have already spoken
to @dwoz about this and he is going to address this in a separate PR if needed.
 2018-04-19 12:04:58 -04: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
Erik Johnson
d185f97a47
mocked file_roots and pillar_roots should be dicts 2018-04-18 13:20:07 -05:00
Nicole Thomas
d5997d2301
Merge pull request #47110 from kstreee/fix-misusing-of-timeout 
Fixes misusing of the timeout option.
 2018-04-18 13:16:19 -04: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
Nicole Thomas
eb5ac51a48
Merge pull request #47102 from gtmanfred/2017.7 
dont allow using no_use_wheel for pip 10.0.0 or newer
 2018-04-17 16:44:57 -04:00
rallytime
a40f007962
lint: get_context is in stringutils.py now 2018-04-17 16:29:48 -04:00
Daniel Wallace
3dc93b310b
fix tests 2018-04-17 13:18:18 -05:00
rallytime
3416e398c6
Update old utils paths references to use new paths 2018-04-17 11:02:38 -04:00
rallytime
94c2a12be6
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - tests/integration/modules/test_state.py
  - tests/unit/templates/test_jinja.py
  - tests/unit/test_minion.py
 2018-04-17 10:54:42 -04:00
Daniel Wallace
4c07a3d1e9
fix other tests 2018-04-17 09:23:03 -05:00
kstreee
0624aee0ed
Fixes misusing of the timeout option. 2018-04-17 14:21:15 +09:00
Mike Place
ee90dd5d95
Merge branch '2018.3' into issue46909 2018-04-16 16:59:25 -06:00
Daniel A. Wozniak
3d85e30ce5
AsyncTestCase is required for AsyncEventPublisher 
Other tests that use AsyncTestCase's io_loop will break if AsyncTestCase
is not subclassed when a test instantiates AsyncEventPublisher.
 2018-04-16 14:18:08 -07:00
Mike Place
03892eaf0b
Merge pull request #47068 from cachedout/catch_value_error_socket_test 
Catch an operation on a closed socket in a test
 2018-04-16 13:56:02 -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
Shane Lee
673cd31c65
Merge branch '2017.7' into jinja_test_fix 2018-04-16 10:15:27 -06:00
Daniel A. Wozniak
46fa2c04de
Fix py3 os.linesep wart 2018-04-14 17:09:50 -07:00
Daniel Wozniak
7fddad6cd9
Merge pull request #47064 from dwoz/roots_tests_fix 
Fix fileserver roots tests
 2018-04-14 14:30:22 -07:00
Daniel A. Wozniak
3c565d7e54
Use salt.utils.fopen 2018-04-13 13:14:19 -07:00
Mike Place
7db5625632
Catch an operation on a closed socket in a test 
This failure wouldn't be related to the test in question so it should
be safe to ignore.
 2018-04-13 13:54:18 -06:00
Daniel A. Wozniak
25fd7c0694
fix py3 wart, encode os.linesep 2018-04-13 12:33:23 -07: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
Daniel A. Wozniak
aa965310f1
Clean up cruft 2018-04-13 10:27:17 -07:00
Daniel A Wozniak
efc9866580
Jinja test fixes 2018-04-13 10:23:34 -07:00
Daniel A Wozniak
d79f1a1961
Fix fileserver roots tests 2018-04-13 10:15:13 -07:00
Matt Phillips
8af3f5b874 GH-47000: add proper handling of full_return in cmd_subset 
as noted in the original issue, full_return wasnt being handled properly. This
rectifies that.
 2018-04-13 10:58:03 -04: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
Daniel A. Wozniak
18b1730320
Skip test that requires pywin32 on *nix platforms 2018-03-27 11:38:20 -07:00
Daniel A. Wozniak
ec4634fc06
Better explanation in doc strings 2018-03-27 10:35:51 -07:00
rallytime
00d4eb26f3
Merge branch '2018.3.0rc1' into '2018.3' 
Conflicts:
  - pkg/windows/req.txt
 2018-03-27 11:41:56 -04:00
Nicole Thomas
3f21e9cc65
Merge pull request #46503 from psyer/fix-cmd-run-env-corrupt 
Fixes stdout user environment corruption
 2018-03-27 10:20:14 -04:00
Gareth J. Greenaway
042930bd3b
A couple more fixes to ensure everything works consistently under python2 and python3, adjusting things that should be bytes and things that should be strings. Updating tests to reflect changes. 2018-03-26 21:51:51 -07:00
Nicole Thomas
0faced1d54
Merge pull request #46565 from twangboy/win_fix_cmd_powershell_2018.3 
Create reg salt util (2018.3)
 2018-03-26 18:03:33 -04:00
twangboy
5ee64e9b0e
Fix lint (spelling error) 2018-03-26 13:02:53 -06:00
Daniel A. Wozniak
45dce1a485
Add reg module to globals 2018-03-26 12:00:39 -07:00
Nicole Thomas
fadc5e4ba4
Merge pull request #46669 from terminalmage/pillar-merge-order 
Add option to return to pre-2017.7.3 pillar include merge order
 2018-03-26 15:00:27 -04:00
Daniel A. Wozniak
d9ae2abb34
Fix splling in docstring 2018-03-26 09:45:04 -07:00
Nicole Thomas
6c80d90bb6
Merge pull request #46693 from dwoz/test_smtp_return 
File and Pillar roots are dictionaries
 2018-03-26 11:15:37 -04:00
Nicole Thomas
47409eaa6e
Merge pull request #46646 from twangboy/win_fix_test_local_cache 
Fix `unit.returners.test_local_cache` for Windows
 2018-03-26 10:16:22 -04:00
Daniel A Wozniak
b40efc5db8
Windows test client fixes 
- Skip IPC transport test on windows
- Add TCP transport test for windows
 2018-03-23 15:36:32 -07:00
Daniel A. Wozniak
5bf850c67f
File and Pillar roots are dictionaries 
Fixes test_smtp_return test cases.
 2018-03-23 11:42:14 -07:00
Daniel A Wozniak
628b87d5c4
Skip test when git symlinks are not configured 2018-03-22 23:30:15 -07: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
Daniel A. Wozniak
73d06f664b Fix linter error 2018-03-22 13:47:41 -07:00
twangboy
fc9ecd75e2
Skip unit.state.test_reg unless on Windows 2018-03-22 14:29:35 -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
Erik Johnson
b4a1d34b47
Add option to return to pre-2017.7.3 pillar include merge order 
https://github.com/saltstack/salt/pull/45025 changed the pillar include
merge order. This adds a new config option which allows a user to revert
to the pre-2017.7.3 behavior.
 2018-03-22 13:35:12 -05:00
Daniel A. Wozniak
009a8f56ea
Fix up environ state tests for Windows 2018-03-22 11:31:25 -07:00
Michael Calmer
3ceb63f607 fix checking test results 2018-03-22 16:31:46 +01:00
Michael Calmer
af64632bf3 add unit test for failed login 2018-03-22 08:57:16 +01:00
Daniel A. Wozniak
b4be10b8fc
Fixing cleanUp method to restore environment 
The clean-up method was not reliabliy restoring sys.environment on
windows. Using Mock's patch to cleanup more reliably.
 2018-03-21 20:01:30 -07: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
twangboy
8d93156604
Fix unit.returners.test_local_cache for Windows 
time.time is only precise to 3 decimal places in Windows. This adds a
sleep for .25 seconds to allow the test to pass
Also fixes a lint error
 2018-03-21 16:00:52 +00:00
Erik Johnson
e8582e80f2
Python 3-compatibility fix to unit test 
This should not be returning a string type for stderr, since
Popen.communicate() returns a bytestring. In Python 2, the str and bytes
types are the same, but the same is not true in Python 3.

Additionally, the mocking here seems not to consider the fact that Popen
is called when runas is used to get the runas user's environment. Since
this test doesn't care about the output, we can just make the mocked
Popen.communicate() return an empty bytestring.
 2018-03-20 22:09:18 -05:00
Daniel A. Wozniak
eb822f5a12
Fix file.recurse w/ clean=True #36802 
Fix an endless looping but in file.recurse when clean is set to true.
This patch normalizes paths and handles the root correctly.
 2018-03-20 16:12:01 -07:00
rallytime
0f728186aa
Fix pillar unit test failures: file_roots and pillar_roots environments should be lists 2018-03-20 17:49:58 -04:00
rallytime
46ba72fb1c
Fix pillar unit test failures: file_roots and pillar_roots environments should be lists 2018-03-20 17:32:21 -04:00
rallytime
b03cda3cea
Merge branch '2018.3.0rc1' into '2018.3' 
No conflicts.
 2018-03-20 09:13:13 -04:00
Erik Johnson
db304c3eff
Update tests to reflect changes to state returns 2018-03-19 15:18:49 -05:00
Nicole Thomas
e7dc802e2c
Merge branch '2018.3.0rc1' into optional_grains 2018-03-19 07:39:02 -04:00
Nicole Thomas
218b7f7a08
Merge pull request #46401 from garethgreenaway/46335_unicode_broke_the_x509_star 
[2018.3.0rc1] fixes to x509 module
 2018-03-16 13:57:53 -04:00
rallytime
8886b61576
Update old utils paths to new paths 2018-03-15 17:31:29 -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
twangboy
50a860b839
Remove unicode things 2018-03-15 12:55:26 -06:00
twangboy
8474006dab
Fix 2 tests 
Modifies the fibre_channel.py grain for linux to allow mocking. You
can't mock a file handle used in a for loop.
Fixes the mocking in test_windows_iscsi_iqn_grains. Apparently, you
can't stack multiple mocks in the same with statement.
 2018-03-15 11:15:57 -06:00
twangboy
5636ab7cd4
Fix some lint 2018-03-14 16:39:40 -06:00
twangboy
16949c0b93
Fix failing tests, add new tests 2018-03-14 16:37:42 -06:00
Frode Gundersen
1ad4d7d988
fix assert errors 2018-03-13 21:01:46 +00:00
Frode Gundersen
e6a56016df
update test 2018-03-13 20:54:25 +00:00
Erik Johnson
a8b1f0d640
Add unit test for salt-ssh edge case 2018-03-13 13:39:27 -05:00
Erik Johnson
4106840deb
user.present: don't change uid/gid unless explicitly told to 
Prior to this change, this state would update the uid/gid. This change
may have been accidental, and can cause problems with file ownership. A
uid/gid change must now be explicitly requested via two new arguments to
the `user.present` state.
 2018-03-12 19:30:47 -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
Nicole Thomas
b7191b8782
Merge pull request #46413 from meaksh/2017.7-explore-result-in-depth 
Explore 'module.run' state module output in depth to catch "result" properly
 2018-03-12 14:49:06 -04:00
Gareth J. Greenaway
08fce29653
Silly typo in test. 2018-03-10 06:23:00 -08:00
Gareth J. Greenaway
84d720b14c
Adding some code that was accidently reverted back in. 2018-03-10 06:21:47 -08:00
Gareth J. Greenaway
2c43911f62
Fixing lint. 2018-03-10 06:01:01 -08:00
Gareth J. Greenaway
e813b74fbe
Update test_x509.py 
Lint fixes.
 2018-03-10 06:01:00 -08:00
Gareth J. Greenaway
1d57787a6f
Gating the two tests that require m2crypto to be available. 2018-03-10 06:01:00 -08:00
Gareth J. Greenaway
70aca0da57
Recent unicode changes into Oxygen broke some aspects of the x509 module. When processing PEM text, it needs to be treated as ascii not unicode. Adding a couple tests for affected functions. 2018-03-10 06:01:00 -08:00
Nicole Thomas
cac096b311
Merge pull request #46434 from gtmanfred/highstate_return 
split return key value correctly
 2018-03-09 12:45:20 -05:00
Nicole Thomas
9c089aa4de
Merge pull request #46421 from bdrung/skip-ssh-tests-if-ssh-is-missing 
Skip SSHPasswordTests if ssh binary is not found
 2018-03-09 11:21:01 -05:00
Daniel Wallace
d18f1a55a7
fix pylint 2018-03-09 08:23:17 -07:00
Nicole Thomas
a188984cd9
Merge pull request #46446 from bdrung/fix-typos 
Fix various typos
 2018-03-08 16:11:46 -05:00
Daniel Wallace
9e2c3f7991
split return key value correctly 2018-03-08 13:38:52 -07:00
Nicole Thomas
e35fc5263c
Merge pull request #46309 from bdrung/dynamic-pillarenv 
Support dynamic pillar_root environment
 2018-03-08 14:15:35 -05: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
Nicole Thomas
35fe9827fe
Merge pull request #46430 from terminalmage/issue44032 
Improve reliability/idempotence of file.blockreplace state
 2018-03-08 10:41:37 -05: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
Benjamin Drung
584b451fd1 Support dynamic pillar_root environment 
Allow users to specify a __env__ pillar_root directory that applies
equally to all environments that are not explicitly specified.

fixes #20581
Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-03-08 10:12:40 +01:00
Erik Johnson
f9f187e915
Improve reliability/idempotence of file.blockreplace state 
This makes the following changes:

- The `append_newline` argument to the `file.blockreplace`
  remote-execution function has been modified so that if its value is
  `None`, it only appends a newline when the content block does not end
  in one.
- A couple of fixes were made to newline handling. The existing code
  normalized the newlines in the content block, replacing them with
  os.linesep. However, when the file contains newlines that don't match
  the OS (i.e. POSIX newlines in a file on a Windows box, or Windows
  newlines on a Linux/Mac/BSD/etc. box), then we would still end up with
  mixed newlines. The line separator is now detected when we read in the
  original file, and the detected line separator is used when writing
  the content block. Additionally, the same newline mismatch was
  possible when appending/prepending the content block. This has been
  fixed by using a common function for appending, prepending, and
  replacing the content block.
- Support for the `append_newline` argument has been added to the
  `file.blockreplace` state. The default value for the state is `None`.
  A `versionchanged` has been added to the remote execution function to
  let users know that the Fluorine release will change the default value
  of that variable.
- 20 new integration tests have been written to test the
  `file.blockreplace` state.
 2018-03-07 22:29:39 -06:00
Erik Johnson
4798187035
Improve reliability/idempotence of file.blockreplace state (2018.3 branch) 
This makes the following changes:

- The `append_newline` argument to the `file.blockreplace`
  remote-execution function has been modified so that if its value is
  `None`, it only appends a newline when the content block does not end
  in one.
- A couple of fixes were made to newline handling. The existing code
  normalized the newlines in the content block, replacing them with
  os.linesep. However, when the file contains newlines that don't match
  the OS (i.e. POSIX newlines in a file on a Windows box, or Windows
  newlines on a Linux/Mac/BSD/etc. box), then we would still end up with
  mixed newlines. The line separator is now detected when we read in the
  original file, and the detected line separator is used when writing
  the content block. Additionally, the same newline mismatch was
  possible when appending/prepending the content block. This has been
  fixed by using a common function for appending, prepending, and
  replacing the content block.
- Support for the `append_newline` argument has been added to the
  `file.blockreplace` state. The default value for the state is `None`.
  A `versionchanged` has been added to the remote execution function to
  let users know that the Fluorine release will change the default value
  of that variable.
- 20 new integration tests have been written to test the
  `file.blockreplace` state.
 2018-03-07 22:29:09 -06:00
Pablo Suárez Hernández
885751634e
Add new unit test to check state.apply within module.run 2018-03-07 15:43:52 +00:00
Benjamin Drung
3d6f658309 Skip SSHPasswordTests if ssh binary is not found 
If the ssh binary is not found in path, SSHPasswordTests will fail:

ERROR: test_password_failure (unit.ssh.test_ssh.SSHPasswordTests)
[CPU:0.0%|MEM:54.9%]
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/unit/ssh/test_ssh.py", line 42, in test_password_failure
    client = ssh.SSH(opts)
  File "salt/client/ssh/__init__.py", line 226, in __init__
    raise salt.exceptions.SaltSystemExit('No ssh binary found in path -- ssh must be '
salt.exceptions.SaltSystemExit: None

Either SSHPasswordTests needs to be converted into a real unit test
(i.e. mocking the salt call) or this tests needs to be skipped if ssh is
not available.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-03-07 16:36:06 +01:00
Mihai Dinca
b5e508f339 Fix openscap push 2018-03-07 14:55:50 +01:00
rallytime
d83727fdf9
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/cli/api.py
  - salt/client/ssh/wrapper/state.py
  - salt/config/__init__.py
  - salt/crypt.py
  - salt/daemons/masterapi.py
  - salt/key.py
  - salt/loader.py
  - salt/master.py
  - salt/modules/archive.py
  - salt/modules/hipchat.py
  - salt/modules/pip.py
  - salt/modules/state.py
  - salt/modules/virt.py
  - salt/modules/x509.py
  - salt/state.py
  - salt/transport/tcp.py
  - salt/transport/zeromq.py
  - salt/utils/__init__.py
  - salt/utils/event.py
  - salt/utils/extmods.py
  - salt/utils/files.py
  - salt/utils/parsers.py
  - salt/utils/verify.py
  - tests/integration/shell/test_call.py
  - tests/unit/utils/test_args.py
 2018-03-06 13:45:59 -05:00
Justin Findlay
d5561bedaf
tests.unit.grains.core add scoped IPv6 nameserver 2018-03-05 12:31:04 -08:00
Nicole Thomas
a8f2f1b063
Merge pull request #46322 from terminalmage/issue44935 
yamlify_arg: don't treat leading dashes as lists
 2018-03-05 10:40:16 -05:00
Nicole Thomas
88b5f7383d
Merge pull request #46242 from redbaron4/fix-46127 
Pass env_vars to pip.freeze
 2018-03-05 09:53:12 -05:00
Erik Johnson
85ac6a9893
yamlify_arg: don't treat leading dashes as lists 
We had a similar check to ensure "foo: bar" isn't loaded as a dict, this
adds a check to ensure that we only load lists when there is a leading
bracket.
 2018-03-03 15:02:12 -06:00
Nicole Thomas
241611aca5
Merge pull request #46307 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2018.3.0rc1 to 2018.3
 2018-03-03 07:56:06 -05:00
Erik Johnson
61ab47ee70
Merge branch '2017.7' into merge-2017.7-2018.3 
Conflicts:
- salt/cloud/clouds/openstack.py
- salt/daemons/masterapi.py
- salt/master.py
- salt/modules/gentoo_service.py
- salt/pillar/__init__.py
- salt/pillar/git_pillar.py
- salt/runners/cache.py
- salt/runners/git_pillar.py
- salt/runners/winrepo.py
- salt/utils/docker/__init__.py
- salt/utils/gitfs.py
 2018-03-02 16:20:20 -06:00
rallytime
c9fa21f62c
Merge branch '2018.3.0rc1' into '2018.3' 
No conflicts.
 2018-03-02 14:22:07 -05:00
Nicole Thomas
5ffa482343
Merge pull request #46285 from gtmanfred/2018.3.0rc1 
fix return dict for salt-ssh if something goes wrong
 2018-03-02 12:17:42 -05:00
Nicole Thomas
5416fcf6dc
Merge pull request #46275 from terminalmage/issue46274 
Make sure rest_cherrypy's config is all str types on PY2
 2018-03-02 12:15:33 -05:00
Erik Johnson
aeeb533225
Fix master conf test for PY3 
PY3 should have no non-unicode strings, this was a bug in the test
 2018-03-02 11:06:13 -06:00
Daniel Wallace
417e45686b
add unit test 2018-03-02 07:48:26 -07:00
Dmitry Kuzmenko
51c311bc1c
Payload Py3 fix and set handling. 2018-03-02 06:01:42 +03:00
Erik Johnson
2f7ae45088
Add conf file unicode test for master 2018-03-01 13:43:33 -06:00
Nicole Thomas
c490a50452
Merge pull request #45874 from GwiYeong/2017.7-local-client-hotfix 
fix for local client timeout bug
 2018-03-01 14:39:35 -05:00
Nicole Thomas
dc2833aa87
Merge branch '2018.3.0rc1' into bugs/46202_msgpack_custom_types_rework 2018-03-01 10:47:07 -05:00
Dheeraj
727ebe1056
Merge branch '2017.7' into fix-46127 2018-03-01 10:19:38 +05:30
Dmitry Kuzmenko
a664864ab1
Rework msgpack serialization of unsupported types in serial 2018-03-01 02:16:31 +03:00
Nicole Thomas
da60399b8f
Merge pull request #46183 from oeuftete/fix-docker-container-running-host-config-ulimits 
Fix docker_container.running HostConfig Ulimits comparison
 2018-02-28 17:22:11 -05:00
Nicole Thomas
7382654c70
Merge pull request #46227 from Ch3LL/smtp_file_client 
Mock file_client call in smtp return test
 2018-02-28 17:12:22 -05:00
Dmitry Kuzmenko
4dfc44ac39
A basic fix for loading datetime objects with msgpack 2018-02-28 23:05:51 +03:00
Nicole Thomas
a97a3e6fb0
Merge pull request #46101 from jfindlay/openrc_ret 
In OpenRC exec module, make sure to ignore retcode on status
 2018-02-28 15:01:36 -05:00
Nicole Thomas
123625213e
Merge pull request #46232 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-02-28 14:16:36 -05:00
Nicole Thomas
687575b582
Merge pull request #46238 from terminalmage/fds-in-fopen 
Don't allow salt.utils.files.fopen() to open stdin/stdout/stderr
 2018-02-28 14:08:22 -05:00
Erik Johnson
a7575aed67
Add unit test for config loading 2018-02-28 08:44:15 -06:00
rallytime
04f24c1794
Lint: fix from a bad merge 
The TestJinjaDefaultOptions test class ended up with the TestCustomExtensions
class definition. This changes the bad merge back to the TestCase class.
 2018-02-28 09:18:27 -05:00
Dheeraj Gupta
aa9d709015 Pass env_vars to pip.freeze 
pip.installed state calls pip.freeze to check for existing installation
and to verify installation post-install. This patch propagates the
env_vars passed to pip.installed to the pip.freeze function. It also modifies
existing pip unit tests to test new functionality and adds an integration test
that verifies the expected correct behavior

Fixes #46127
 2018-02-28 16:44:20 +05:30
Erik Johnson
586d8b0dcf
archive.extracted: don't check source file when if_missing path exists 
This exits the state early with a True result when the if_missing path
exists.
 2018-02-27 23:39:32 -06:00
Ken Crowell
5b09644429
Sort lists from Ulimits before comparing 2018-02-27 23:49:05 -04:00
Erik Johnson
fe1527a3c4
Don't allow salt.utils.files.fopen() to open stdin/stdout/stderr 
It's like crossing the streams. h/t @garethgreenaway
 2018-02-27 18:39:54 -06:00
rallytime
aad61c77bd
Update old utils paths to new paths 2018-02-27 17:20:45 -05:00
rallytime
7243baf2c0
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/topics/orchestrate/orchestrate_runner.rst
  - salt/grains/core.py
  - salt/modules/git.py
  - salt/pillar/ec2_pillar.py
  - salt/runner.py
  - salt/utils/ssh.py
  - tests/integration/modules/test_cp.py
  - tests/unit/grains/test_core.py
  - tests/unit/modules/test_file.py
  - tests/unit/modules/test_git.py
 2018-02-27 17:13:28 -05:00
twangboy
415821eee9
Fix encoding issue 2018-02-27 14:38:07 -07:00
Ch3LL
280dc9a2b6
Mock file_client call in smtp return test 2018-02-27 16:36:38 -05:00
rallytime
776f2ea5d7
Merge branch '2018.3.0rc1' into '2018.3' 
Conflicts:
  - salt/pillar/file_tree.py
  - tests/unit/modules/test_yumpkg.py
 2018-02-26 11:01:42 -05:00
Bo Maryniuk
f00cf88c7b Fix unit test for socket data 2018-02-26 15:04:49 +01:00
Benjamin Drung
0b445f2a37 tests: Add unit tests for _parse_os_release() 
Add tests cases to fully cover _parse_os_release().

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-02-26 13:38:23 +01:00
Benjamin Drung
f6069b77ed Fix osfinger grain on Debian 
Rework _run_os_grains_tests() to check all os grains including osfinger.
Fix osfinger on Debian (e.g. use "Debian-9" instead of
"Debian GNU/Linux-9").

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-02-26 13:36:33 +01:00
Benjamin Drung
8dde55a761 tests: Add os_grains test cases for Debian 
Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-02-26 13:36:33 +01:00
Benjamin Drung
ff02ab9937 tests: Add Ubuntu 17.10 (artful) os_grains test case 
Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-02-26 13:36:33 +01:00
Benjamin Drung
77d5356aba Fix incorrect oscodename grain on Ubuntu 
Use the full content of /etc/os-release for the Ubuntu 16.04 (artful)
os_grains test case. This reveals a bug that 'oscodename' is not
correctly calculated if /etc/os-release provides PRETTY_NAME:

FAIL: test_ubuntu_os_grains (tests.unit.grains.test_core.CoreGrainsTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/unit/grains/test_core.py", line 439, in test_ubuntu_os_grains
    self._run_ubuntu_os_grains_tests(_os_release_map)
  File "tests/unit/grains/test_core.py", line 446, in _run_ubuntu_os_grains_tests
    self._run_os_grains_tests(os_release_map)
  File "tests/unit/grains/test_core.py", line 262, in _run_os_grains_tests
    self.assertEqual(os_grains.get('oscodename'), os_release_map['oscodename'])
AssertionError: 'Ubuntu 16.04.3 LTS' != 'xenial'
- Ubuntu 16.04.3 LTS
+ xenial

fixes #34423 for Ubuntu
Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-02-26 13:36:33 +01:00
Benjamin Drung
7e62dc9fd2 tests: Support reading os-release files from disk 
Instead of storing pre-parsed os-release files, add support for reading
os-release files from disk.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-02-26 13:36:33 +01:00
Benjamin Drung
a92ec0db1b Make _parse_os_release() always callable 
To simplify running unit tests against os_data(), make the
_parse_os_release() function always callable to avoid needing to mock
os.path.isfile().

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-02-26 13:36:33 +01:00
Benjamin Drung
eee1fe5b38 tests: Dissolve _run_ubuntu_os_grains_tests 
_run_ubuntu_os_grains_tests is only used once and does not provide any
useful abstraction since the introduction of _run_os_grains_tests.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-02-26 13:36:33 +01:00
Benjamin Drung
1d6ef731fe tests: Deduplicate _run_os_grains_tests() 
_run_suse_os_grains_tests() and _run_ubuntu_os_grains_tests() share most
of their logic. Combine the common part in _run_os_grains_tests() and
let the remaining small parts live in their origin functions.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-02-26 13:36:33 +01:00
rallytime
69ac94baca
Update utils paths 2018-02-24 06:55:09 -05:00
rallytime
cffbf52c10
Lint fix: remove extra line 2018-02-24 06:51:25 -05:00
Nicole Thomas
705caa8cca
Merge pull request #46148 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2017.7.3 to 2017.7
 2018-02-23 14:21:38 -05:00
rallytime
79bed6cff1
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/cmdmod.py
  - salt/modules/reg.py
  - salt/modules/win_lgpo.py
  - salt/modules/win_path.py
  - salt/modules/win_pkg.py
  - salt/pillar/file_tree.py
  - salt/states/boto3_route53.py
  - salt/states/reg.py
  - salt/utils/win_functions.py
  - tests/unit/modules/test_kubernetes.py
  - tests/unit/modules/test_win_path.py
 2018-02-23 09:50:19 -05:00
Nicole Thomas
e6374bf68d
Merge pull request #46149 from rallytime/bp-46145 
Back-port #46145 to oxygen.rc1
 2018-02-22 16:57:51 -05:00
rallytime
29468f3dce
Lint fixes 2018-02-22 14:18:28 -05:00
Erik Johnson
2b887dd77d
Update tests to reflect changes to the SaltCacheLoader 2018-02-22 10:51:36 -05:00
rallytime
25deebf7a6
Merge branch '2017.7.3' into '2017.7' 
Conflicts:
  - salt/modules/git.py
 2018-02-22 10:22:22 -05:00
Erik Johnson
e2c4702e0c
Update tests to reflect changes to the SaltCacheLoader 2018-02-21 23:20:02 -06:00
Erik Johnson
1668a489c4
Update refrences to Oxygen codename to 2018.3.0 2018-02-21 21:47:41 -06:00
Nicole Thomas
0e63decaac
Merge pull request #46117 from Ch3LL/mac_ssh_schema 
Add stringutils.to_str in test_roster_config_validate test
 2018-02-21 09:57:44 -05:00
Nicole Thomas
a50bb41849
Merge pull request #46110 from isbm/isbm-iscsii-master-nonroot 
IQN check for iSCSII crash on non-root Master
 2018-02-21 09:56:53 -05:00
Bo Maryniuk
1b75f98a91 Catch proper exception type 2018-02-21 13:11:44 +01:00