From e1422bb5e4a510b8f1844f50af0c4f1659b5cdfe 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 13:00:08 +0100
Subject: [PATCH] testrunner: handle EOF and ProcessLookupError
---
dist/tools/testrunner/testrunner.py | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/dist/tools/testrunner/testrunner.py b/dist/tools/testrunner/testrunner.py
index 471c93253d..9f11b1148e 100755
--- a/dist/tools/testrunner/testrunner.py
+++ b/dist/tools/testrunner/testrunner.py
@@ -1,4 +1,5 @@
-# Copyright (C) 2016 Kaspar Schleiser <kaspar@schleiser.de>
+# Copyright (C) 2017 Cenk Gündoğan <cenk.guendogan@haw-hamburg.de>
+# 2016 Kaspar Schleiser <kaspar@schleiser.de>
# 2014 Martine Lenders <mlenders@inf.fu-berlin.de>
#
# This file is subject to the terms and conditions of the GNU Lesser
@@ -54,9 +55,19 @@ def run(testfunc, timeout=10, echo=True, traceback=False):
if traceback:
print_tb(sys.exc_info()[2])
return 1
+ except pexpect.EOF:
+ line, filename, lineno = find_exc_origin(sys.exc_info()[2])
+ print("Unexpected end of file in expect script at \"%s\" (%s:%d)" %
+ (line, filename, lineno))
+ if traceback:
+ print_tb(sys.exc_info()[2])
+ return 1
finally:
print("")
- os.killpg(os.getpgid(child.pid), signal.SIGKILL)
- child.close()
+ try:
+ os.killpg(os.getpgid(child.pid), signal.SIGKILL)
+ except ProcessLookupError:
+ print("Process already stopped")
+ child.close()
return 0
--
GitLab