valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #53514 from Ch3LL/disable_py3_logging

Browse Source 
Revert logging changes from #53492
This commit is contained in:
Gareth J. Greenaway 2019-06-18 13:49:03 -07:00 committed by GitHub
commit 0793272181
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 msgpack
# Import Salt libs # Import Salt libs
from salt.ext import six
from salt.utils.platform import is_darwin from salt.utils.platform import is_darwin
import salt.log.setup import salt.log.setup
@ -34,6 +35,8 @@ __virtualname__ = 'runtests_log_handler'
def __virtual__(): def __virtual__():
if 'runtests_log_port' not in __opts__: if 'runtests_log_port' not in __opts__:
return False, "'runtests_log_port' not in options" 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 return True