From 3f8b9fb1a53624382e7cb85f1b9f4d79995cc44f Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 11 May 2017 07:34:52 +0200 Subject: [PATCH] tests: Improve matching of exceptions to show verbose output In some situations we can get a TypeError without a stack --- tests/end2end/fixtures/testprocess.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/end2end/fixtures/testprocess.py b/tests/end2end/fixtures/testprocess.py index 4c3a6972e..913fec859 100644 --- a/tests/end2end/fixtures/testprocess.py +++ b/tests/end2end/fixtures/testprocess.py @@ -79,7 +79,7 @@ def _render_log(data, threshold=100): """Shorten the given log without -v and convert to a string.""" data = [str(d) for d in data] is_exception = any('Traceback (most recent call last):' in line - for line in data) + or 'Uncaught exception' in line for line in data) verbose = pytest.config.getoption('--verbose') if len(data) > threshold and not verbose and not is_exception: msg = '[{} lines suppressed, use -v to show]'.format(