valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
99,890 Commits 24 Branches 182 Tags 341 MiB
25ec653fd4
Commit Graph

15372 Commits

Author SHA1 Message Date
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
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
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
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
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
Gareth J. Greenaway
464d813b77
Merge branch '2018.3' into fix_test_pkg 2019-01-22 13:42:03 -08:00
Daniel A. Wozniak
c1ea10f090
Fix py3 managed.file test failure 2019-01-22 10:46:32 -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
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
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
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
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
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
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