riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

testrunner: handle EOF and ProcessLookupError

Browse Source
This commit is contained in:
Cenk Gündoğan 2017-11-12 13:00:08 +01:00
parent d537dd609f
commit e1422bb5e4
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dist/tools/testrunner/testrunner.py vendored
View File

@ -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> # 2014 Martine Lenders <mlenders@inf.fu-berlin.de>
# #
# This file is subject to the terms and conditions of the GNU Lesser # 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: if traceback:
print_tb(sys.exc_info()[2]) print_tb(sys.exc_info()[2])
return 1 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: finally:
print("") print("")
try:
os.killpg(os.getpgid(child.pid), signal.SIGKILL) os.killpg(os.getpgid(child.pid), signal.SIGKILL)
child.close() except ProcessLookupError:
print("Process already stopped")
child.close()
return 0 return 0