valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
85,764 Commits 24 Branches 182 Tags 341 MiB
799c601184
Commit Graph

85764 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Wallace
8497e08f8e
fix pip module for 10.0.0 
Fixes #46971
 2018-04-17 09:23:03 -05:00
Daniel Wallace
4c07a3d1e9
fix other tests 2018-04-17 09:23:03 -05:00
Daniel Wallace
b71e3d8a04
dont allow using no_use_wheel for pip 10.0.0 or newer 
The --no-use-wheel flag has been deprecated in pip 10.0.0
 2018-04-17 09:23:02 -05:00
kstreee
0624aee0ed
Fixes misusing of the timeout option. 2018-04-17 14:21:15 +09:00
Daniel Wozniak
6a4c0b8a1a
Merge pull request #47108 from dwoz/async_test_fix 
Fix unit.utils.test_event.TestAsyncEventPublisher.test_event_subscription
 2018-04-16 17:25:06 -07:00
Daniel A. Wozniak
3d85e30ce5
AsyncTestCase is required for AsyncEventPublisher 
Other tests that use AsyncTestCase's io_loop will break if AsyncTestCase
is not subclassed when a test instantiates AsyncEventPublisher.
 2018-04-16 14:18:08 -07:00
Mike Place
03892eaf0b
Merge pull request #47068 from cachedout/catch_value_error_socket_test 
Catch an operation on a closed socket in a test
 2018-04-16 13:56:02 -06:00
Erik Johnson
fed5041c5f
Make error more specific to aid in troubleshooting 2018-04-16 12:55:57 -05:00
Erik Johnson
8c67ab53b4
Fix path in log message 
The actual error refers to the parent dir of the master/minion/etc. pki
subdir (i.e. /etc/salt/pki instead of /etc/salt/pki/minion). Therefore,
the startswith check needs to look for the parent of the pki_dir.
 2018-04-16 12:48:06 -05:00
Erik Johnson
3198ca8b19
Make error more explicit when PKI dir not present for salt-call 2018-04-16 12:44:41 -05:00
François PICOT
149f846f34 fix normalize parameter in pkg.installed 2018-04-16 19:03:20 +02:00
Shane Lee
1ea2885ec2
Merge pull request #47065 from dwoz/jinja_test_fix 
Jinja test fix
 2018-04-16 10:16:41 -06:00
Shane Lee
673cd31c65
Merge branch '2017.7' into jinja_test_fix 2018-04-16 10:15:27 -06:00
Daniel Wallace
5293b5b5ca
Merge pull request #47077 from dwoz/test_state_fix 
Fix failing state test by normalizing line endings
 2018-04-16 10:48:38 -05:00
Daniel Wallace
ca967de5da
Merge pull request #47067 from gtmanfred/2017.7 
use the recommended opennebula lookup method
 2018-04-16 10:48:14 -05:00
Daniel A. Wozniak
444da3f893
Fix py3 wart (chr vs bytesstring) 2018-04-14 17:39:29 -07:00
Daniel A. Wozniak
46fa2c04de
Fix py3 os.linesep wart 2018-04-14 17:09:50 -07:00
Daniel A Wozniak
e8acca01c2
Fix failing state test by normalizing line endings 
Fixes:

integration.modules.test_state.StateModuleTest.test_issue_1896_file_append_source
 2018-04-14 15:45:11 -07:00
Daniel Wozniak
7fddad6cd9
Merge pull request #47064 from dwoz/roots_tests_fix 
Fix fileserver roots tests
 2018-04-14 14:30:22 -07:00
Mike Place
977c6939c4
Merge pull request #47069 from cachedout/match_timeout_arg 
Pass the timeout variable to the CLI when calling salt in tests
 2018-04-14 09:20:25 -06:00
Daniel Wallace
2c4c19c622
Merge pull request #47074 from dwoz/ignore_artifacts 
Kitchn should ignore artifacts directory
 2018-04-14 08:06:18 -05:00
Daniel A. Wozniak
c3941efad0
Kitchn should ignore artifacts directory 2018-04-14 00:42:04 -07:00
Mike Place
b8990f5258
Pass the timeout variable to the CLI when calling salt in tests 2018-04-13 16:37:01 -06:00
Nicole Thomas
c484c0bd71
Merge pull request #47055 from bloomberg/GH-47000 
#47000 - add proper handling of full_return in cmd_subset
 2018-04-13 16:17:09 -04:00
Daniel A. Wozniak
3c565d7e54
Use salt.utils.fopen 2018-04-13 13:14:19 -07:00
Mike Place
7db5625632
Catch an operation on a closed socket in a test 
This failure wouldn't be related to the test in question so it should
be safe to ignore.
 2018-04-13 13:54:18 -06:00
Daniel Wallace
f913a7859c
use the recommended opennebula lookup method 2018-04-13 14:45:18 -05:00
Daniel A. Wozniak
25fd7c0694
fix py3 wart, encode os.linesep 2018-04-13 12:33:23 -07:00
Nicole Thomas
f3496030cc
Merge pull request #47039 from twangboy/win_fix_winrm_script 
Fix winrm powershell script
 2018-04-13 14:09:55 -04:00
Daniel A. Wozniak
aa965310f1
Clean up cruft 2018-04-13 10:27:17 -07:00
Daniel A Wozniak
efc9866580
Jinja test fixes 2018-04-13 10:23:34 -07:00
Daniel A Wozniak
d79f1a1961
Fix fileserver roots tests 2018-04-13 10:15:13 -07:00
Matt Phillips
8af3f5b874 GH-47000: add proper handling of full_return in cmd_subset 
as noted in the original issue, full_return wasnt being handled properly. This
rectifies that.
 2018-04-13 10:58:03 -04:00
Nicole Thomas
1700a10ebe
Merge pull request #46326 from kstreee/fix-client-local 
Fixes a timing bug of saltnado's client local.
 2018-04-13 09:59:27 -04:00
twangboy
6635b9003f
Fix winrm powershell script 
Removes the `Hostname` paramater in the winrm create command. It is not
needed. It must match the hostname on the certificate, which is not
defined in the case of the Remote Desktop certificate
Removes extra spaces
 2018-04-12 14:41:19 -06:00
twangboy
990a24d7ed
Fix build_env scripts 
Uses `cmd /c` when launching commands to avoid the hang when installing
python 3
`clean_env.bat` will uninstall Py2 and Py3 in a single run
 2018-04-12 11:26:40 -06:00
Nicole Thomas
c3c00316c5
Merge pull request #46913 from lomeroe/2017_7-fix46877 
2017.7 Fix #46877 -- win_lgpo start/shutdown script reading
 2018-04-12 11:10:49 -04:00
Nicole Thomas
9e37cfc9d6
Merge pull request #47025 from terminalmage/fix-server_id-windows 
Fix server_id grain in PY3 on Windows
 2018-04-12 11:07:59 -04:00
Nicole Thomas
2e193cfb45
Merge pull request #47027 from rallytime/bp-44508 
Back-port #44508 to 2017.7
 2018-04-12 11:05:50 -04:00
Daniel Wallace
385fe2bc1e
Merge pull request #47020 from rallytime/bp-46970 
Back-port #46970 to 2017.7
 2018-04-11 16:48:24 -05:00
zbroch
8e72f362f4
Add priority field to support the latest capirca. 2018-04-11 12:47:48 -04:00
zbroch
112f92baab
Add priority field to support the latest capirca. 2018-04-11 12:47:48 -04:00
Erik Johnson
cb0cf89ed3
Fix server_id grain in PY3 on Windows 
https://github.com/saltstack/salt/pull/46649 caused a regression on
Windows since the executable path does not exist. This fixes that grain
on Windows by using `sys.executable`.
 2018-04-11 11:33:12 -05:00
Gareth J. Greenaway
9373dff52b
Update test_pkgrepo.py 2018-04-11 10:55:36 -04:00
Gareth J. Greenaway
13cf9eb5b1
Removing debugging. 2018-04-11 10:55:36 -04:00
Gareth J. Greenaway
a61a8593e5
Removing suse from pkgrepo comments tests. the pkgrepo functions in SUSE pkg module do not support comments. 2018-04-11 10:55:36 -04:00
Nicole Thomas
8f994e7cf9
Merge pull request #46539 from jfoboss/patch-1 
#46504 Fix
 2018-04-11 10:13:23 -04:00
jfoboss
6890122e41
Merge pull request #1 from twangboy/pull_46539 
Fix unit test for win_ntp
 2018-04-11 10:01:53 +03:00
Nicole Thomas
74d70e95a5
Merge pull request #46999 from gtmanfred/2017.7 
switch pip test package
 2018-04-10 17:18:32 -04:00
lomeroe
369a0645ed move exception for clarity 2018-04-10 15:50:25 -05:00