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

quteprocess: replace Expected with expected

Browse Source
This commit is contained in:
Daniel Schadt 2016-07-02 17:22:40 +02:00
parent 4863df5ac8
commit ee9d3b6a49
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/end2end/fixtures/quteprocess.py
View File

@ -115,15 +115,15 @@ class LogLine(testprocess.Line):
r.funcName = self.function r.funcName = self.function
format_str = log.EXTENDED_FMT 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. # which expect errors but fail due to other errors.
if self.expected and self.loglevel > logging.INFO: if self.expected and self.loglevel > logging.INFO:
new_color = '{' + log.LOG_COLORS['DEBUG'] + '}' new_color = '{' + log.LOG_COLORS['DEBUG'] + '}'
format_str = format_str.replace('{log_color}', new_color) format_str = format_str.replace('{log_color}', new_color)
format_str = re.sub(r'{levelname:(\d*)}', format_str = re.sub(r'{levelname:(\d*)}',
# Leave away the padding because (Expected) is # Leave away the padding because (expected) is
# longer anyway. # longer anyway.
r'{levelname} (Expected)', format_str) r'{levelname} (expected)', format_str)
formatter = log.ColoredFormatter(format_str, log.DATEFMT, '{', formatter = log.ColoredFormatter(format_str, log.DATEFMT, '{',
use_colors=colorized) use_colors=colorized)

4
tests/end2end/fixtures/test_quteprocess.py
View File

@ -207,7 +207,7 @@ def test_log_line_parse(data, attrs):
{'created': 0, 'levelname': 'ERROR', 'name': 'foo', 'module': 'bar', {'created': 0, 'levelname': 'ERROR', 'name': 'foo', 'module': 'bar',
'funcName': 'qux', 'lineno': 10, 'levelno': 40, 'message': 'quux'}, 'funcName': 'qux', 'lineno': 10, 'levelno': 40, 'message': 'quux'},
False, True, 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) # 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', {'created': 0, 'levelname': 'ERROR', 'name': 'foo', 'module': 'bar',
'funcName': 'qux', 'lineno': 10, 'levelno': 40, 'message': 'quux'}, 'funcName': 'qux', 'lineno': 10, 'levelno': 40, 'message': 'quux'},
True, True, 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', '\033[36mfoo bar:qux:10\033[0m \033[37mquux\033[0m',
), ),
], ids=['normal', 'traceback', 'colored', 'expected error', 'expected other', ], ids=['normal', 'traceback', 'colored', 'expected error', 'expected other',