Commit Graph

8479 Commits

Author SHA1 Message Date
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
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
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
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
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
Gareth J. Greenaway
cd336ed822
Merge branch '2018.3' into ldap-groups 2019-01-02 18:49:00 -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
Adam Mendlik
94f8ee4a7b
Update unit tests for auth.ldap 2018-12-31 14:34:10 -07:00
Daniel Wozniak
cecd108aff
Merge pull request #51004 from twangboy/win_wusa
Add tests for the win_wusa state and module
2018-12-31 13:03:29 -07:00
twangboy
c0d2495713
Fix lint, add test docs 2018-12-28 12:18:48 -07:00
twangboy
17502700fc
Add state tests for win_wusa 2018-12-28 11:57:23 -07:00