rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests: Shorten (not suppress) quteproc log w/o -v.

Browse Source 
The output was almost always useless without -v because the debug log wasn't
shown at all, only error/info.

Now we display a maximum of 50 lines (regardless of what level) without -v.
This commit is contained in:
Florian Bruhin 2016-01-07 19:39:46 +01:00
parent df6d9d741f
commit 9e9cedf3e0
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/integration/quteprocess.py
View File

@ -169,11 +169,6 @@ class QuteProc(testprocess.Process):
else: else:
raise raise
# WORKAROUND for https://bitbucket.org/logilab/pylint/issues/717/
# we should switch to generated-members after that
# pylint: disable=no-member
if (log_line.loglevel in ['INFO', 'WARNING', 'ERROR'] or
pytest.config.getoption('--verbose')):
self._log(line) self._log(line)
start_okay_message_load = ( start_okay_message_load = (

17
tests/integration/testprocess.py
View File

@ -72,6 +72,18 @@ class Line:
return '{}({!r})'.format(self.__class__.__name__, self.data) return '{}({!r})'.format(self.__class__.__name__, self.data)
def _render_log(data, threshold=50):
"""Shorten the given log without -v and convert to a string."""
# WORKAROUND for https://bitbucket.org/logilab/pylint/issues/717/
# we should switch to generated-members after that
# pylint: disable=no-member
if len(data) > threshold and not pytest.config.getoption('--verbose'):
msg = '[{} lines suppressed, use -v to show]'.format(
len(data) - threshold)
data = [msg] + data[-threshold:]
return '\n'.join(data)
@pytest.hookimpl(hookwrapper=True) @pytest.hookimpl(hookwrapper=True)
def pytest_runtest_makereport(item, call): def pytest_runtest_makereport(item, call):
"""Add qutebrowser/httpbin sections to captured output if a test failed.""" """Add qutebrowser/httpbin sections to captured output if a test failed."""
@ -93,10 +105,9 @@ def pytest_runtest_makereport(item, call):
if quteproc_log is not None: if quteproc_log is not None:
report.longrepr.addsection("qutebrowser output", report.longrepr.addsection("qutebrowser output",
'\n'.join(quteproc_log)) _render_log(quteproc_log))
if httpbin_log is not None: if httpbin_log is not None:
report.longrepr.addsection("httpbin output", report.longrepr.addsection("httpbin output", _render_log(httpbin_log))
'\n'.join(httpbin_log))
class Process(QObject): class Process(QObject):