From eef1604dcdc3b381a2795e63b09da2ca4d2143ad Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Fri, 8 Jan 2016 08:35:34 +0100 Subject: [PATCH] tests: Improve WaitForClipboardTimeout message. --- tests/integration/features/conftest.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/integration/features/conftest.py b/tests/integration/features/conftest.py index bbf284923..5d374af77 100644 --- a/tests/integration/features/conftest.py +++ b/tests/integration/features/conftest.py @@ -403,11 +403,14 @@ def _wait_for_clipboard(qtbot, clipboard, mode, expected): QClipboard.Selection: 'primary selection', } raise WaitForClipboardTimeout( - "Timed out after {}ms waiting for {} in {} (clipboard: {!r}, " - "primary {!r}).".format( - timeout, expected, mode_names[mode], - clipboard.text(mode=QClipboard.Clipboard), - clipboard.text(mode=QClipboard.Selection)) + "Timed out after {timeout}ms waiting for {what}:\n" + " expected: {expected!r}\n" + " clipboard: {clipboard!r}\n" + " primary: {primary!r}.".format( + timeout=timeout, what=mode_names[mode], + expected=expected, + clipboard=clipboard.text(mode=QClipboard.Clipboard), + primary=clipboard.text(mode=QClipboard.Selection)) )