From 0ce9e84f38059ce74389a6dcf766e48e75797869 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Thu, 14 Sep 2017 09:01:11 -0700 Subject: [PATCH] Fix import test handling of multi-line messages. --- test/runner/importer.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/runner/importer.py b/test/runner/importer.py index 35685f5ed6..8f9f91ad74 100755 --- a/test/runner/importer.py +++ b/test/runner/importer.py @@ -5,6 +5,7 @@ from __future__ import absolute_import, print_function import imp import os +import re import sys import traceback @@ -50,6 +51,7 @@ def main(): # Hack to remove the filename and line number from the message, if present. message = message.replace(' (%s, line %d)' % (os.path.basename(path), line), '') + message = re.sub(r'\n *', ': ', message) error = '%s:%d:%d: %s: %s' % (source, line, offset, exc_type.__name__, message) if error not in messages: