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

Don't use the aliased classes

Browse source
This commit is contained in:
Pedro Algarvio 2021-03-05 15:50:04 +00:00 • committed by Megan Wilhite
parent 4b9f728bba
commit 8a6719ee83
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/conftest.py
View file

@ -27,9 +27,9 @@ import _pytest.skipping
import psutil
import pytest
import salt._logging.impl
import salt._logging.mixins
import salt.config
import salt.loader
import salt.log.mixins
import salt.utils.files
import salt.utils.path
import salt.utils.platform
@ -80,7 +80,7 @@ collect_ignore = ["setup.py"]
# Patch PyTest logging handlers
class LogCaptureHandler(
salt.log.mixins.ExcInfoOnLogLevelFormatMixIn, _pytest.logging.LogCaptureHandler
salt._logging.mixins.ExcInfoOnLogLevelFormatMixin, _pytest.logging.LogCaptureHandler
):
"""
Subclassing PyTest's LogCaptureHandler in order to add the
@ -94,7 +94,7 @@ _pytest.logging.LogCaptureHandler = LogCaptureHandler
class LiveLoggingStreamHandler(
salt.log.mixins.ExcInfoOnLogLevelFormatMixIn,
salt._logging.mixins.ExcInfoOnLogLevelFormatMixin,
_pytest.logging._LiveLoggingStreamHandler,
):
"""