mirror of
https://github.com/valitydev/salt.git
synced 2024-11-06 16:45:27 +00:00
Merge branch '2019.2.1' into crypt_test_mac
This commit is contained in:
commit
700338ea30
@ -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
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user