Skip to content

Commit 6563f57

Browse files
committed
Display log messages separate from context in Qt5
1 parent 01d88b9 commit 6563f57

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

pytestqt/_tests/test_logging.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,8 @@ def foo():
320320
if QT_API == 'pyqt5':
321321
res.stdout.fnmatch_lines([
322322
'*test_lineno_failure.py:2: Failure*',
323-
'*test_lineno_failure.py:foo:5: QtWarning*'],
324-
)
323+
'*test_lineno_failure.py:foo:5:*',
324+
' QtWarningMsg: this is a WARNING message',
325+
])
325326
else:
326327
res.stdout.fnmatch_lines('*test_lineno_failure.py:2: Failure*')

pytestqt/plugin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,7 @@ def pytest_addoption(parser):
571571
default=True)
572572
if QT_API == 'pyqt5':
573573
default = '{rec.context.file}:{rec.context.function}:' \
574-
'{rec.context.line}: {rec.type_name}: {rec.message}'
574+
'{rec.context.line}:\n {rec.type_name}: {rec.message}'
575575
else:
576576
default = '{rec.type_name}: {rec.message}'
577577
parser.addoption('--qt-log-format', dest='qt_log_format', default=default)

0 commit comments

Comments
 (0)