The `TimeoutExpired` exception is used in multiple locations
throughout the Python tests. However, it needs to be used as
`subprocess.TimeoutExpired` given that it is only defined in that
module.
Signed-off-by: Antoine Busque <abusque@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
if sys.version_info >= (3, 3):
try:
daemon_process_return_code = daemon_process.wait(5)
if sys.version_info >= (3, 3):
try:
daemon_process_return_code = daemon_process.wait(5)
+ except subprocess.TimeoutExpired:
daemon_process.kill()
daemon_process_return_code = -1
else:
daemon_process.kill()
daemon_process_return_code = -1
else:
if sys.version_info >= (3, 3):
try:
exit_fast_process.wait(5)
if sys.version_info >= (3, 3):
try:
exit_fast_process.wait(5)
+ except subprocess.TimeoutExpired:
exit_fast_process.kill()
bail("Failed to run exit-fast test application.")
else:
exit_fast_process.kill()
bail("Failed to run exit-fast test application.")
else:
if sys.version_info >= (3, 3):
try:
exit_fast_process.wait(5)
if sys.version_info >= (3, 3):
try:
exit_fast_process.wait(5)
+ except subprocess.TimeoutExpired:
exit_fast_process.kill()
bail("Failed to run exit-fast test application in suicide mode.")
else:
exit_fast_process.kill()
bail("Failed to run exit-fast test application in suicide mode.")
else:
if sys.version_info >= (3, 3):
try:
fork_process.wait(5)
if sys.version_info >= (3, 3):
try:
fork_process.wait(5)
+ except subprocess.TimeoutExpired:
fork_process.kill()
bail("Failed to run fork test application (time out)", session_info)
else:
fork_process.kill()
bail("Failed to run fork test application (time out)", session_info)
else:
if sys.version_info >= (3, 3):
try:
malloc_process.wait(5)
if sys.version_info >= (3, 3):
try:
malloc_process.wait(5)
+ except subprocess.TimeoutExpired:
malloc_process.kill()
bail("Failed to run libustinstr-malloc test application.", session_info)
else:
malloc_process.kill()
bail("Failed to run libustinstr-malloc test application.", session_info)
else:
if sys.version_info >= (3 ,3):
try:
demo_process.wait(5)
if sys.version_info >= (3 ,3):
try:
demo_process.wait(5)
+ except subprocess.TimeoutExpired:
demo_process.kill()
bail("Failed to run demo test application without preloading")
else:
demo_process.kill()
bail("Failed to run demo test application without preloading")
else:
if sys.version_info >= (3, 3):
try:
demo_process.wait(5)
if sys.version_info >= (3, 3):
try:
demo_process.wait(5)
+ except subprocess.TimeoutExpired:
demo_process.kill()
bail("Failed to run {0} test application".format(executable_name))
else:
demo_process.kill()
bail("Failed to run {0} test application".format(executable_name))
else: