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,770 Commits 24 Branches 182 Tags 341 MiB
863ded39fa
Commit Graph

7979 Commits

Author SHA1 Message Date
Erik Johnson
91f9fd38fd
Fix loader whitelists in unit tests 
This resolves failed lazydict lookups in the tests due to improperly-set
whitelists.
 2018-05-17 16:43:36 -05:00
twangboy
771392e299
Fix unit tests, add newline='' to io.open 2018-05-17 13:25:35 -06:00
lomeroe
49053bc106 lint fix 2018-05-17 13:56:24 -05:00
lomeroe
6f185c9179 another lint fix 2018-05-17 12:20:49 -05:00
lomeroe
dbffba6876 fix tons of errors in my tests 2018-05-17 10:50:50 -05:00
lomeroe
8c9355d34c Lint fix 2018-05-17 08:34:19 -05:00
lomeroe
b29ec75da7 Update regexes in core grains for detecting the 'product' grain on 
Solaris Sparc systems.  Additionally, copy the 'product' grain to
'productname' to be consistent with other OSes.
 2018-05-16 16:34:07 -05:00
twangboy
008af0ac6b
Fix unit tests 2018-05-16 15:13:41 -06:00
Erik Johnson
d0243e8f23
Suppress spurious lint failure 
This is failing because elsewhere in the test module the get_top()
member function returns None, but this is done in a highstate attribute
which is cleaned up in the tearDown and established as a fresh
salt.state.HighState instance in the setUp.
 2018-05-16 15:13:54 -05:00
Erik Johnson
3b449f11fc
Add regression test for excludes issue 2018-05-16 12:26:46 -05:00
Erik Johnson
d729656703
Add unit tests for table outputter 2018-05-16 00:02:14 -05:00
andrei
454291ad62
Fix errors when attempting to cache files with long names or URLs 2018-05-15 22:39:09 -05:00
Nicole Thomas
ff861d9089
Merge branch '2018.3' into 2018.3-remove-trailing-commas-on-linux-user-gecos-fields 2018-05-15 11:37:58 -04:00
Pablo Suárez Hernández
7dea455c12
Add unit test for new method 'user.chother' 2018-05-14 10:54:33 +01:00
Pablo Suárez Hernández
d5c9ca0fbc
Add unit tests for GECOS fields 2018-05-14 10:54:33 +01: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
9836a7e62b
Merge pull request #47564 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-05-10 15:13:35 -04:00
Nicole Thomas
e3ee7053fb
Merge pull request #47563 from rallytime/bp-47224 
Back-port #47224 to 2018.3
 2018-05-10 12:18:06 -04:00
Ch3LL
0763f96458
update salt.utils.platform path for virt core test 2018-05-09 18:02:17 -04:00
Ch3LL
14896f9743
change codeauthor and class name 2018-05-09 17:48:59 -04:00
Ch3LL
502c5bdff5
Ensure mac_service.disabled is correctly querying services 2018-05-09 17:12:50 -04:00
Ch3LL
718252c1ef
Update salt.utils.path mock in virtual core test 2018-05-09 13:24:39 -04:00
rallytime
25f03ae425
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - tests/integration/modules/test_status.py
  - tests/integration/states/test_pip_state.py
  - tests/support/case.py
  - tests/whitelist.txt
 2018-05-09 11:24:02 -04:00
Jorge Schrauwen
1d191445a7
FIX #38671 - zpool.get should support older zfs version 2018-05-09 11:10:24 -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
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
Erik Johnson
9f7a9ebebd
Rename pip state test modules to match naming convention 
This makes the naming match the naming convention used throughout the
test suite and will make the changes in
https://github.com/saltstack/salt/pull/47337 work better.
 2018-05-04 15:03:44 -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
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
Daniel A. Wozniak
ca9393b7fb
Skip tests not applicable to windows 2018-05-03 19:55:46 -07: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
Erik Johnson
3ab332ad0e
Update tests to reflect bugfix 2018-05-02 15:21:39 -05: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
Shane Lee
f031710af2
Merge branch '2017.7' into fix_47024 2018-05-01 16:26:04 -06:00
twangboy
7c46d9d0d4
Fix integration.modules.test_pip 
Pass password as kwarg for runas on Windows
Fix issues with pip 10 in unit.states.test_pip
 2018-05-01 15:33:29 -06:00
Nicole Thomas
0bdfaa5ffe
Merge pull request #47368 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-05-01 14:56:19 -04:00
Erik Johnson
89ddb08026
Use a lambda instead of defining a one-line function 2018-04-30 14:30:01 -05:00
Erik Johnson
e03b865359
Add unit test for file.get_diff 2018-04-30 11:45:22 -05:00
Daniel Wallace
3400f829c4
Merge pull request #47374 from DSRCorporation/bugs/tornado50-2018.3 
tornado50 merge forward for 2018.3
 2018-04-29 11:29:11 -05:00
Daniel A. Wozniak
67745c1362
Older GitPython versions will not have close 2018-04-29 00:50:20 -07:00
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