From d537dd609f5aaabc7abcabf1ab0dcdb4540c2bd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cenk=20G=C3=BCndo=C4=9Fan?= <mail-github@cgundogan.de>
Date: Sun, 12 Nov 2017 12:59:45 +0100
Subject: [PATCH] testrunner: refactor exception printing
---
dist/tools/testrunner/testrunner.py | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/dist/tools/testrunner/testrunner.py b/dist/tools/testrunner/testrunner.py
index 5b2b73e20c..471c93253d 100755
--- a/dist/tools/testrunner/testrunner.py
+++ b/dist/tools/testrunner/testrunner.py
@@ -21,6 +21,14 @@ RIOTBASE = os.environ['RIOTBASE'] or \
def list_until(l, cond):
return l[:([i for i, e in enumerate(l) if cond(e)][0])]
+def find_exc_origin(exc_info):
+ pos = list_until(extract_tb(exc_info),
+ lambda frame: frame.filename.startswith(PEXPECT_PATH)
+ )[-1]
+ return pos.line, \
+ os.path.relpath(os.path.abspath(pos.filename), RIOTBASE), \
+ pos.lineno
+
def run(testfunc, timeout=10, echo=True, traceback=False):
env = os.environ.copy()
child = pexpect.spawnu("make term", env=env, timeout=timeout)
@@ -40,13 +48,9 @@ def run(testfunc, timeout=10, echo=True, traceback=False):
try:
testfunc(child)
except pexpect.TIMEOUT:
- timeouted_at = list_until(extract_tb(sys.exc_info()[2]),
- lambda frame:
- frame.filename.startswith(PEXPECT_PATH))[-1]
+ line, filename, lineno = find_exc_origin(sys.exc_info()[2])
print("Timeout in expect script at \"%s\" (%s:%d)" %
- (timeouted_at.line,
- os.path.relpath(os.path.abspath(timeouted_at.filename), RIOTBASE),
- timeouted_at.lineno))
+ (line, filename, lineno))
if traceback:
print_tb(sys.exc_info()[2])
return 1
--
GitLab