Skip to content

Commit

Permalink
Merge pull request #53514 from Ch3LL/disable_py3_logging
Browse files Browse the repository at this point in the history
Revert logging changes from #53492
  • Loading branch information
garethgreenaway committed Jun 18, 2019
2 parents 98285f9 + 8c8f0ac commit 0793272
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions tests/integration/files/log_handlers/runtests_log_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import msgpack

# Import Salt libs
from salt.ext import six
from salt.utils.platform import is_darwin
import salt.log.setup

Expand All @@ -34,6 +35,8 @@
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


Expand Down

0 comments on commit 0793272

Please sign in to comment.