saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '2019.2.1' into crypt_test_mac

Browse source
This commit is contained in:
Megan Wilhite 2019-06-18 16:53:48 -04:00 • committed by GitHub
commit 700338ea30
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tests/integration/files/log_handlers/runtests_log_handler.py
View file

@ -23,6 +23,7 @@ from multiprocessing import Queue
import msgpack
# Import Salt libs
from salt.ext import six
from salt.utils.platform import is_darwin
import salt.log.setup
@ -34,6 +35,8 @@ __virtualname__ = 'runtests_log_handler'
def __virtual__():
if 'runtests_log_port' not in __opts__:
return False, "'runtests_log_port' not in options"
if six.PY3:
return False, "runtests external logging handler is temporarily disabled for Python 3 tests"
return True