From ee9d3b6a49ede450b8a6d7fc54c10739c64cc599 Mon Sep 17 00:00:00 2001 From: Daniel Schadt Date: Sat, 2 Jul 2016 17:22:40 +0200 Subject: [PATCH] quteprocess: replace Expected with expected --- tests/end2end/fixtures/quteprocess.py | 6 +++--- tests/end2end/fixtures/test_quteprocess.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/end2end/fixtures/quteprocess.py b/tests/end2end/fixtures/quteprocess.py index 0b0deeb83..2058d585e 100644 --- a/tests/end2end/fixtures/quteprocess.py +++ b/tests/end2end/fixtures/quteprocess.py @@ -115,15 +115,15 @@ class LogLine(testprocess.Line): r.funcName = self.function format_str = log.EXTENDED_FMT - # Mark expected errors with (Expected) so it's less confusing for tests + # Mark expected errors with (expected) so it's less confusing for tests # which expect errors but fail due to other errors. if self.expected and self.loglevel > logging.INFO: new_color = '{' + log.LOG_COLORS['DEBUG'] + '}' format_str = format_str.replace('{log_color}', new_color) format_str = re.sub(r'{levelname:(\d*)}', - # Leave away the padding because (Expected) is + # Leave away the padding because (expected) is # longer anyway. - r'{levelname} (Expected)', format_str) + r'{levelname} (expected)', format_str) formatter = log.ColoredFormatter(format_str, log.DATEFMT, '{', use_colors=colorized) diff --git a/tests/end2end/fixtures/test_quteprocess.py b/tests/end2end/fixtures/test_quteprocess.py index 5de7ae5f4..4c9f74f63 100644 --- a/tests/end2end/fixtures/test_quteprocess.py +++ b/tests/end2end/fixtures/test_quteprocess.py @@ -207,7 +207,7 @@ def test_log_line_parse(data, attrs): {'created': 0, 'levelname': 'ERROR', 'name': 'foo', 'module': 'bar', 'funcName': 'qux', 'lineno': 10, 'levelno': 40, 'message': 'quux'}, False, True, - '{timestamp} ERROR (Expected) foo bar:qux:10 quux', + '{timestamp} ERROR (expected) foo bar:qux:10 quux', ), # Expected other message (i.e. should make no difference) ( @@ -221,7 +221,7 @@ def test_log_line_parse(data, attrs): {'created': 0, 'levelname': 'ERROR', 'name': 'foo', 'module': 'bar', 'funcName': 'qux', 'lineno': 10, 'levelno': 40, 'message': 'quux'}, True, True, - '\033[32m{timestamp}\033[0m \033[37mERROR (Expected)\033[0m ' + '\033[32m{timestamp}\033[0m \033[37mERROR (expected)\033[0m ' '\033[36mfoo bar:qux:10\033[0m \033[37mquux\033[0m', ), ], ids=['normal', 'traceback', 'colored', 'expected error', 'expected other',