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
100,362 Commits 24 Branches 182 Tags 341 MiB
7ed0d7dd51
Commit Graph

15537 Commits

Author SHA1 Message Date
Pedro Algarvio
f4e169255b
Fix test 2019-01-28 20:37:05 +00:00
Daniel A. Wozniak
542d85713b
Fix linter issues 2019-01-28 10:32:00 -07:00
Daniel A. Wozniak
a2bbf4dea8
Fix linter issues 2019-01-28 10:30:35 -07:00
Daniel A. Wozniak
004d9b828f
Cloud provider and profile configs are merged 2019-01-28 10:23:18 -07:00
Daniel A. Wozniak
a8af3baed2
Cloud provider and profile configs are merged 2019-01-28 10:20:54 -07:00
Erik Johnson
ad17ac591c
Fix mocks to reflect changes to git.latest state 2019-01-28 10:46:26 -06:00
Daniel Wozniak
d4b90933ac
Merge pull request #51336 from Ch3LL/merge-2019.2.0rc1 
[2019.2] Merge Forward from 2019.2.0.rc1 to 2019.2
 2019-01-27 16:55:08 -07:00
Daniel Wozniak
fdf2cf4893
Merge pull request #51250 from yosnoop/fix-salt-utils-dns-lookup 
Fix broken lookup in salt/utils/dns.py
 2019-01-27 16:53:52 -07:00
Daniel Wozniak
02b43a09fb
Merge pull request #51334 from Ch3LL/merge-2019.2 
[2019.2] Merge forward from 2018.3 to 2019.2
 2019-01-27 16:49:31 -07:00
Daniel Wozniak
43a9d2f972
Merge pull request #51338 from Ch3LL/bp-51207 
Backport #51207 into 2018.3.4
 2019-01-27 16:44:58 -07:00
Daniel Wozniak
4e855050e8
Merge branch '2018.3.4' into bp-51170 2019-01-27 16:44:10 -07:00
Daniel Wozniak
7908875bc0
Merge pull request #51341 from Ch3LL/bp-51299 
Backport #51299 into 2018.3
 2019-01-27 16:43:35 -07:00
Daniel Wozniak
7656aa5f66
Merge pull request #51340 from Ch3LL/bp-51252 
Backport #51252 into 2018.3.4
 2019-01-27 16:42:48 -07:00
Ty Hahn
9fb4abea3f
Merge branch '2018.3' into fix-salt-utils-dns-lookup 2019-01-26 05:31:46 +09:00
Wayne Werner
e3080f10d6
Add sleep before sending stop over UDP 
UDP packets are unordered - and apparently on Mac it's pretty easy for
the stop message to come before the last message we're trying to test
with. This has us wait a tenth of a second more before we tell the test
thing to stop.

Signed-off-by: Wayne Werner <wwerner@saltstack.com>
 2019-01-25 14:48:40 -05:00
Daniel A. Wozniak
e74a6c61de
Fix py3 managed.file test failure 2019-01-25 14:42:50 -05:00
Daniel A. Wozniak
824950c4cd
Fix 50221 regression test on Windows 2019-01-25 14:42:38 -05:00
Daniel A. Wozniak
1840af9c00
peserve newlines from pillar data for file.managed 2019-01-25 14:42:32 -05:00
twangboy
345ae676b6
Backport PR# 50771 to 2018.3 branch 2019-01-25 14:38:30 -05:00
Daniel A. Wozniak
c893dc445a
Fix saltmod roster test 2019-01-25 14:32:58 -05:00
Daniel A. Wozniak
484bab4399
Fix linter 2019-01-25 14:32:42 -05:00
Daniel A. Wozniak
5e2db2f7af
Honor roster file for ssh orchestrations 2019-01-25 14:32:36 -05:00
Gareth J. Greenaway
2284ea5162
Merge branch '2019.2' into merge-2019.2.0rc1 2019-01-25 11:30:27 -08:00
Ch3LL
18bf2369f8
Merge branch '2019.2.0.rc1' into 2019.2 
Conflicts:
  - salt/modules/win_lgpo.py
 2019-01-25 14:27:17 -05:00
Ch3LL
25ec653fd4
Merge branch '2018.3' into '2019.2' 
Conflicts:
  - .codecov.yml
  - salt/modules/artifactory.py
 2019-01-25 13:19:07 -05:00
Pedro Algarvio
da3aace317
Merge branch '2018.3.4' into hotfix/fix-network 2019-01-25 15:14:24 +00:00
Pedro Algarvio
39fb981faa
"Tell" coverage to track subprocesses. 2019-01-25 13:03:26 +00:00
Pedro Algarvio
2eafc5c411
"Tell" coverage to track subprocesses. 2019-01-25 13:00:03 +00:00
Pedro Algarvio
f6babeb915
Remove unused imports 2019-01-25 13:00:03 +00:00
Pedro Algarvio
ff6824c682
Don't fail the test because of order 2019-01-25 13:00:03 +00:00
Pedro Algarvio
4d12ccbb1a
Show objects on assertion failure 2019-01-25 13:00:03 +00:00
Pedro Algarvio
ee2f10a23b
Add pytest-salt-from-filenames to pytest requirements 2019-01-25 13:00:03 +00:00
Pedro Algarvio
78c6d68008
Run tests from tox, wether runtests or pytest 2019-01-25 13:00:02 +00:00
Pedro Algarvio
3840af86df
"Tell" coverage to track subprocesses. 2019-01-25 12:58:52 +00:00
Pedro Algarvio
bd7072f3c8
Merge branch '2018.3' into 1257_something_something_bytes_argh_python2 2019-01-25 09:34:49 +00:00
Gareth J. Greenaway
0e542c5515
Fixing various bits in x509 module and unit test to ensure tests are passing on python2 & python3 2019-01-24 16:41:49 -08:00
Pedro Algarvio
f27589aff7
Remove unused imports 2019-01-24 23:21:00 +00:00
Pedro Algarvio
3000d2095d
Fix tests. We no longer get ipaddress instances back. 2019-01-24 23:15:21 +00:00
Pedro Algarvio
a26ba7f3aa
Don't fail the test because of order 2019-01-24 23:15:21 +00:00
Gareth J. Greenaway
c847f54293
Swap passed addr for string rather than ipaddress object. 2019-01-24 15:04:27 -08:00
Gareth J. Greenaway
87f3972606
removing another debugging log. 2019-01-24 14:52:31 -08:00
Gareth J. Greenaway
ad64efbabe
Use MagicMock 2019-01-24 14:51:17 -08:00
Gareth J. Greenaway
5812eae808
Adding a test to ensure dns_check works as expected. 2019-01-24 14:48:41 -08:00
Gareth J. Greenaway
3dbe8dc8be
When making auth calls, only username, password, auth, and token are valid, so we strip anything else out. 2019-01-24 12:45:35 -08:00
Pedro Algarvio
f67a529b7a
Remove unused imports 2019-01-24 20:33:08 +00:00
twangboy
f4177e0adb
Remove mode parameter on Windows 2019-01-24 10:11:48 -07:00
Pedro Algarvio
138ca2e682
Show objects on assertion failure 2019-01-24 17:02:13 +00:00
Pedro Algarvio
840b3d2103
Add pytest-salt-from-filenames to pytest requirements 2019-01-24 17:02:13 +00:00
Pedro Algarvio
6bb56ced2e
Run tests from tox, wether runtests or pytest 2019-01-24 17:02:13 +00:00
Pedro Algarvio
15ab061b8c
Show objects on assertion failure 2019-01-24 16:58:42 +00:00
Pedro Algarvio
0281fc5b50
Don't fail the test because of order 2019-01-24 16:58:42 +00:00
Pedro Algarvio
97ced3a5ba
Add pytest-salt-from-filenames to pytest requirements 2019-01-24 16:58:41 +00:00
Pedro Algarvio
aa108d5dd1
Run tests from tox, wether runtests or pytest 2019-01-24 16:58:41 +00:00
Ty Hahn
9a34bcda10 Unit test for lookup with servers option 2019-01-24 22:14:30 +09:00
Ty Hahn
af867e14dc Remove excessive whitespaces 2019-01-24 21:32:46 +09:00
Ty Hahn
0d074a4f2e Fix a comment 2019-01-24 21:32:46 +09:00
Pedro Algarvio
f94e721e75
Merge branch '2019.2.0.rc1' into issue51258 2019-01-24 11:41:48 +00:00
Pedro Algarvio
d4ab6d815b
Merge branch '2018.3' into fix_test_pkg 2019-01-24 11:39:57 +00:00
Pedro Algarvio
f96828a9d6
Merge branch '2018.3' into issue-50221 2019-01-24 11:36:52 +00:00
Megan Wilhite
7fa04212a3
Merge pull request #51223 from twangboy/merge_auditpol 
Bring auditpol support to rc1
 2019-01-23 15:48:21 -05:00
Erik Johnson
3649bb063f
Fix edge case when minion ID is a 16-character string 
Some code in salt._compat which checks if the value is a packed binary
representation of an IPv6 address fails if the value passed is not a
bytestring (i.e. a `unicode` type on PY2 or `str` type on PY3). This
fixes that code when the minion ID is a 16-character string (not a
bytestring). Note that the minion ID will never be a bytestring as of
2018.3.0, so this affects any 16-character minion ID when the minion ID
is checked to see if it is really an IP address.
 2019-01-23 14:29:36 -06:00
Gareth J. Greenaway
53ba0689a8
When test=True and there are permissions changes, report it. 2019-01-23 14:06:31 -05:00
Pedro Algarvio
04f16b8c91
Fix tests. We no longer get ipaddress instances back. 2019-01-23 18:07:25 +00:00
Pedro Algarvio
aacc047686
Merge pull request #51274 from twangboy/fix_network 
Fix minion start issue
 2019-01-23 18:03:02 +00:00
Daniel A. Wozniak
a5255f0eb2
Merge remote-tracking branch 'saltstack/2018.3' into issue-50221 2019-01-23 08:26:20 -07:00
Pedro Algarvio
344bf6567a
Fix tests. We no longer get ipaddress instances back. 2019-01-23 14:47:11 +00:00
twangboy
9464af259a
Skip test_getI_file_templated_paths on Windows/Py3 2019-01-22 15:42:37 -07:00
Thomas S Hatch
1a2f680e1d
Merge pull request #51239 from garethgreenaway/51208_file_manage_escaped_double_quotes 
[2018.3] Fixes to __build_parts in stringutils
 2019-01-22 15:17:48 -07:00
Thomas S Hatch
1abffb20b9
Merge pull request #51278 from dwoz/issue51248 
Warn about proper validation option
 2019-01-22 15:13:12 -07:00
Gareth J. Greenaway
464d813b77
Merge branch '2018.3' into fix_test_pkg 2019-01-22 13:42:03 -08:00
Daniel A. Wozniak
c614198477
Use pillar roots validation method 2019-01-22 12:19:06 -07:00
Ch3LL
1dd92a943a
Fix pylint for 2019.2 2019-01-22 13:38:45 -05:00
Daniel A. Wozniak
c1ea10f090
Fix py3 managed.file test failure 2019-01-22 10:46:32 -07:00
Daniel A. Wozniak
0d2b0c635f
Fix linter warnings 2019-01-22 10:40:57 -07:00
Erik Johnson
c8e70a90a6
Merge pull request #51206 from terminalmage/fix-reload 
Fix usage of reload for PY3 compatibility
 2019-01-22 11:34:45 -06:00
Daniel A. Wozniak
5b98895588
Fix wart in pillar_roots validation 
Adds tests for pillar and file roots validation
 2019-01-22 10:23:08 -07:00
Gareth J. Greenaway
d0d5726ffa
Merge branch '2018.3' into merge-2019.2 2019-01-22 09:20:42 -08:00
Gareth J. Greenaway
0574476321
Merge branch '2018.3' into fix_test_pkg 2019-01-22 08:42:33 -08:00
Lee Webb
e586370c67
Merge branch '2018.3' into 51069-ri-and-rdoc-removed 2019-01-21 10:01:46 +11:00
Daniel A. Wozniak
ac978f0647
Fix 50221 regression test on Windows 2019-01-19 18:21:27 -07:00
Daniel Wozniak
d5acd5bc9c
Merge pull request #51170 from dwoz/issue51158 
Honor roster system for ssh orchestrations
 2019-01-19 16:16:05 -07:00
Daniel A. Wozniak
65f38b5ab2
peserve newlines from pillar data for file.managed 2019-01-19 16:11:49 -07:00
Gareth J. Greenaway
6a9daa7440
Merge branch '2018.3' into 51208_file_manage_escaped_double_quotes 2019-01-18 14:56:24 -08:00
Gareth J. Greenaway
a233dbc79a
Ensuring we can handle a string that contains single quote + an escaped double quote. 2019-01-18 12:45:09 -08:00
Gareth J. Greenaway
c33c5589ca
Backport #50358 to 2017.7 2019-01-18 12:16:03 -08:00
Megan Wilhite
3b966f3ba5
Merge branch '2019.2' into merge-2019.2 2019-01-18 14:47:57 -05:00
Gareth J. Greenaway
cd80548e79
When test=True and there are permissions changes, report it. 2019-01-17 17:31:23 -05:00
Lee Webb
13d3288b88 Fix lint issues 2019-01-18 09:17:47 +11:00
Ch3LL
ffe23fa258
Merge branch '2018.3' into '2019.2' 
Conflicts:
  - salt/cloud/clouds/azurearm.py
  - salt/minion.py
  - salt/utils/network.py
 2019-01-17 17:11:00 -05:00
twangboy
35adc8b272
Merge forward #51154 and #51184 2019-01-17 10:25:12 -07:00
Mathieu Parent
f9437e2590
Test for file_roots envs with slash leads to "No such file or directory" 
See #51211.

2019-01-08 09:57:23,653 [salt.master      :1795][ERROR   ][28091] Error in function _file_list:
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/salt/master.py", line 1788, in run_func
    ret = getattr(self, func)(load)
  File "/usr/lib/python2.7/dist-packages/salt/utils/decorators/__init__.py", line 594, in wrapped
    **salt.utils.data.decode_dict(kwargs)
  File "/usr/lib/python2.7/dist-packages/salt/fileserver/__init__.py", line 752, in file_list
    ret.update(self.servers[fstr](load))
  File "/usr/lib/python2.7/dist-packages/salt/fileserver/roots.py", line 422, in file_list
    return _file_lists(load, 'files')
  File "/usr/lib/python2.7/dist-packages/salt/fileserver/roots.py", line 310, in _file_lists
    __opts__, form, list_cache, w_lock
  File "/usr/lib/python2.7/dist-packages/salt/fileserver/__init__.py", line 122, in check_file_list_cache
    if not os.path.isfile(list_cache) and _lock_cache(w_lock):
  File "/usr/lib/python2.7/dist-packages/salt/fileserver/__init__.py", line 56, in _lock_cache
    os.mkdir(w_lock)
OSError: [Errno 2] No such file or directory: '/var/cache/salt/master/file_lists/roots/.foo/bar.w'
 2019-01-17 17:03:33 +01:00
U-KEIRIN\lwebb
5de5e643da Update tests 2019-01-17 15:50:38 +11:00
twangboy
b91b2c62f5
Backport PR# 50771 to 2018.3 branch 2019-01-16 15:54:17 -07:00
Erik Johnson
31ca7c6936
Fix usage of reload for PY3 compatibility 
This also normalizes some hacks that were in place to import reload from
importlib, so that these instances also use the compatibility function.
 2019-01-16 16:37:41 -06:00
Ch3LL
810c6119ec
Merge branch '2019.2.0.rc1' into 2019.2 2019-01-16 16:38:32 -05:00
Daniel A. Wozniak
b69c002e68
Fix saltmod roster test 2019-01-16 11:20:05 -07:00
Daniel Wozniak
094bd33279
Merge pull request #51184 from twangboy/fix_auditpol 
Fix win_lgpo_auditpol salt util on Windows
 2019-01-16 11:08:00 -07:00
twangboy
7300d84d54
Skip debian tests on Windows 2019-01-16 09:31:37 -05:00
twangboy
4622433f84
Fix test_debian_ip on Windows 2019-01-16 09:31:33 -05:00
twangboy
2e68d35678
directly call cmd.run_all 
Apparently, you can't always use __salt__ in a util
 2019-01-15 18:09:36 -07:00
Daniel Wozniak
563d4875b8
Merge pull request #51010 from amendlik/ldap-groups 
Allow unauthenticated bind for listing LDAP groups
 2019-01-15 09:43:41 -07:00
Daniel Wozniak
b19c990a16
Merge pull request #51097 from terminalmage/fix-keyerror-raise 
Fix improper exception raises (2018.3)
 2019-01-15 09:38:24 -07:00
Daniel Wozniak
58eede65a7
Merge pull request #51173 from dwoz/issue51160 
Avoid exceptions by passing bytes to idna
 2019-01-15 09:32:30 -07:00
Pedro Algarvio
b348ace640 Make sure blackout tests clean up after themselves. Properly. 
(cherry picked from commit 9ab0e98e2c)
 2019-01-15 16:31:35 +00:00
Pedro Algarvio
68a12d50d0 These should not be considered destructive tests 
(cherry picked from commit 479439ab99)
 2019-01-15 16:31:35 +00:00
Jeremy McMillan
71c357414d Revert "backport test improvements from develop" 
This reverts commit 0af7653dfa3fc9b30601dec2c8ac2ce3cba52e7f.

I guess that was way too optimistic.
 2019-01-15 16:31:35 +00:00
Jeremy McMillan
e32d219599 backport test improvements from develop 
Bogus random test failures
forklifted from develop at 414bfe61a4
 2019-01-15 16:31:35 +00:00
Jeremy McMillan
0a92c4691d Need more detail on test failure 2019-01-15 16:31:35 +00:00
Jeremy McMillan
c92a24752c don't try to handle/log test exception 2019-01-15 16:31:35 +00:00
Jeremy McMillan
eb605867c6 remove bad extra test assertion inside exception handler 2019-01-15 16:31:35 +00:00
Jeremy McMillan
f9594b8a1f don't test invalid combination 2019-01-15 16:31:35 +00:00
Jeremy McMillan
de823fd3ae fix good_host_ports iteration 2019-01-15 16:31:35 +00:00
Jeremy McMillan
c5a5b34fc4 test assertion correction 2019-01-15 16:31:35 +00:00
Jeremy McMillan
d28bab6fd0 fix test setup 2019-01-15 16:31:35 +00:00
Jeremy McMillan
571603c4ce coverage for master host:port ipv4 and ipv6 config value support 
fix test_parse_host_port bad values
lint
 2019-01-15 16:31:35 +00:00
Jeremy McMillan
f14ff16626 fix minion zmq connecting to master configured as IPv6 address 2019-01-15 16:31:35 +00:00
Jeremy McMillan
194a024ed0 coverage for master host:port ipv4 and ipv6 config value support 
fix test_parse_host_port bad values
lint
 2019-01-15 16:31:35 +00:00
Jeremy McMillan
df7338809b fix minion zmq connecting to master configured as IPv6 address 2019-01-15 16:31:35 +00:00
Erik Johnson
a3c0b49b64
Fix poorly-written test 
This test was confirming the incorrect prior behavior.
 2019-01-15 05:56:40 -06:00
Shane Lee
05836b3948
Merge branch '2018.3' into issue51158 2019-01-14 20:06:02 -07:00
Daniel A. Wozniak
11cc7b33d4
Remove un-needed test 2019-01-14 20:00:09 -07:00
Daniel A. Wozniak
0f87812aff
Merge develop, Revert exception handling 2019-01-14 19:50:16 -07:00
Daniel A. Wozniak
7365a1a8ec
Pass bytes to idna 2019-01-14 19:10:23 -07:00
Daniel A. Wozniak
bf47f6f806
Fix linter 2019-01-14 16:02:03 -07:00
Gareth J. Greenaway
d39d8b720d
Merge branch '2018.3' into merge-2018.3 2019-01-14 14:48:44 -08:00
Daniel A. Wozniak
6223596073
Honor roster file for ssh orchestrations 2019-01-14 14:21:03 -07:00
Ch3LL
1d7329a618
Fix pylint 2019-01-14 15:15:04 -05:00
Erik Johnson
3bf189e80b
Add unit test to ensure we don't diff bare repos 
Resolves #38502.
 2019-01-14 15:14:07 -05:00
Ch3LL
74edfd97f3
Fix pylint 2019-01-14 15:09:27 -05:00
Adam Mendlik
1a4e307c0d
Ignore exceptions when generating the minion ID 
Fixes #51160
 2019-01-13 20:44:11 -07:00
Daniel Wozniak
fad8621ecb
Merge pull request #51154 from twangboy/auditpol 
Add support for Advanced Audit policies
 2019-01-12 14:43:26 -07:00
Gareth J. Greenaway
f7caa4df51
Fixing lint 2019-01-11 17:01:33 -08:00
Gareth J. Greenaway
e8c8c0f451
Adding some tests to ensure "ALL PRIVILEGES" is handled correctly in 8.0 and 5.6 2019-01-11 16:48:58 -08:00
twangboy
906437647f
Add support for Advanced Audit policies 2019-01-11 17:47:52 -07:00
Ch3LL
81a3d4724a
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - tests/unit/modules/test_debian_ip.py
 2019-01-11 16:38:51 -05:00
Daniel A. Wozniak
2518beaf87
Mark renderer test as flaky for mac tests 2019-01-11 12:39:20 -07:00
Daniel A. Wozniak
23b2c3ed7c
fix flakieness in create wake on lan test 2019-01-08 13:36:03 -07:00
Gareth J. Greenaway
3395a3d185
Merge branch '2017.7' into bugfix-2017.7/ubuntu-networking-searchdomain 2019-01-07 11:52:27 -08:00
Gareth J. Greenaway
9386aab9da
Merge branch '2017.7' into merge-2018.3 2019-01-07 09:42:55 -08:00
Daniel A. Wozniak
a84ba300cb
Passwords are decoded to unicode 2019-01-05 13:40:16 -07:00
Gareth J. Greenaway
2e26d03b01
Merge branch 'fluorine' into merge-singleton-last-ref-close-fluorine 2019-01-03 16:04:19 -08:00
Pedro Algarvio
9ab0e98e2c
Make sure blackout tests clean up after themselves. Properly. 2019-01-03 19:19:16 +00:00
Pedro Algarvio
479439ab99
These should not be considered destructive tests 2019-01-03 16:20:07 +00:00
Gareth J. Greenaway
cd336ed822
Merge branch '2018.3' into ldap-groups 2019-01-02 18:49:00 -08:00
Gareth J. Greenaway
2a16a152be
Merge branch 'fluorine' into merge-fluorine 2019-01-02 17:01:09 -08:00
Erik Johnson
6dbd81fb4b
Add unit test to ensure we don't diff bare repos 
Resolves #38502.
 2019-01-02 15:43:16 -06:00
Gareth J. Greenaway
09815e7f77
Merge branch '2018.3' into merge-fluorine 
Conflicts:
   - salt/states/win_lgpo.py
   - salt/utils/minions.py
 2019-01-01 13:50:01 -08:00
Pedro Algarvio
8badbf935a
Add missing method to mocked channel class 2019-01-01 19:01:33 +00:00
Pedro Algarvio
2c3b1d3973
Only the last instance actually closes 2019-01-01 18:55:14 +00:00
Adam Mendlik
94f8ee4a7b
Update unit tests for auth.ldap 2018-12-31 14:34:10 -07:00