summaryrefslogtreecommitdiffstats
path: root/scripts/automation/trex_control_plane/server/trex_launch_thread.py
diff options
context:
space:
mode:
authorYaroslav Brustinov <ybrustin@cisco.com>2017-03-02 01:25:51 +0200
committerYaroslav Brustinov <ybrustin@cisco.com>2017-03-02 01:25:51 +0200
commit3ea197e5df0de834151dccfa0c7f70651741cac9 (patch)
treec87d2b499578aa906b443e866926aef3b3dbab03 /scripts/automation/trex_control_plane/server/trex_launch_thread.py
parentdc905a7dd6c6938b170964d957a0fafb3cb1ac7f (diff)
t-rex-64: catch exit with trap to restore tty settings
Change-Id: Id336aa95ceff5e958e9bce329c85eb7201772712 Signed-off-by: Yaroslav Brustinov <ybrustin@cisco.com>
Diffstat (limited to 'scripts/automation/trex_control_plane/server/trex_launch_thread.py')
-rwxr-xr-xscripts/automation/trex_control_plane/server/trex_launch_thread.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/automation/trex_control_plane/server/trex_launch_thread.py b/scripts/automation/trex_control_plane/server/trex_launch_thread.py
index a4a7a97c..9598bc98 100755
--- a/scripts/automation/trex_control_plane/server/trex_launch_thread.py
+++ b/scripts/automation/trex_control_plane/server/trex_launch_thread.py
@@ -77,7 +77,7 @@ class AsynchronousTRexSession(threading.Thread):
logger.debug("Finished handling a single run of TRex.")
self.trexObj.zmq_dump = None
- def join (self, timeout = None):
+ def join (self, timeout = 5):
self.stoprequest.set()
super(AsynchronousTRexSession, self).join(timeout)