From 9ccf246a33c19d90baf6a0ab311f71d9641fde2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20K=C3=BCnsem=C3=B6ller?=
<jkuensem@physik.uni-bielefeld.de>
Date: Wed, 18 Apr 2018 13:05:47 +0000
Subject: [PATCH] Task SW-311: Fixed bug: test signal stop handlers get
registered before signal is turned on.
---
LCU/checkhardware/check_hardware.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/LCU/checkhardware/check_hardware.py b/LCU/checkhardware/check_hardware.py
index 333afef267e..06d18f2dc8e 100755
--- a/LCU/checkhardware/check_hardware.py
+++ b/LCU/checkhardware/check_hardware.py
@@ -371,6 +371,11 @@ def safely_start_test_signal(start_cmd, stop_cmd):
:param stop_cmd: the command to stop on exit as shell-executable string
"""
+ # set things up sp signal is stopped when check_hardware terminates
+ register_signal_handlers(stop_cmd)
+ register_exit_handler(stop_cmd)
+ start_watchdog_daemon(os.getpid(), stop_cmd) # this alone would actually be sufficient
+
# start signal
try:
check_call(start_cmd, shell=True)
@@ -378,11 +383,6 @@ def safely_start_test_signal(start_cmd, stop_cmd):
logger.error("Could not start the test signal! Non-zero return code from start_cmd (%s)." % start_cmd, ex)
raise
- # set things up sp signal is stopped when check_hardware terminates
- register_signal_handlers(stop_cmd)
- register_exit_handler(stop_cmd)
- start_watchdog_daemon(os.getpid(), stop_cmd) # this alone would actually be sufficient
-
def safely_start_test_signal_from_ParameterSet(settings):
'''
--
GitLab