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
96,047 Commits 24 Branches 182 Tags 341 MiB
04eb66bc8e
Commit Graph

8497 Commits

Author SHA1 Message Date
Pedro Algarvio
04eb66bc8e
Merge branch '2018.3' into issue51255 2019-01-28 23:19:04 +00:00
Erik Johnson
ad17ac591c
Fix mocks to reflect changes to git.latest state 2019-01-28 10:46:26 -06: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
7908875bc0
Merge pull request #51341 from Ch3LL/bp-51299 
Backport #51299 into 2018.3
 2019-01-27 16:43:35 -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
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
78c6d68008
Run tests from tox, wether runtests or pytest 2019-01-25 13:00:02 +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
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
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
aacc047686
Merge pull request #51274 from twangboy/fix_network 
Fix minion start issue
 2019-01-23 18:03:02 +00:00
Pedro Algarvio
344bf6567a
Fix tests. We no longer get ipaddress instances back. 2019-01-23 14:47:11 +00: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 Wozniak
d5acd5bc9c
Merge pull request #51170 from dwoz/issue51158 
Honor roster system for ssh orchestrations
 2019-01-19 16:16:05 -07:00
Gareth J. Greenaway
cd80548e79
When test=True and there are permissions changes, report it. 2019-01-17 17:31:23 -05: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
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
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
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