summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2017-09-21 21:34:34 +1000
committerChris Johns <chrisj@rtems.org>2017-09-21 21:34:34 +1000
commit3c7cd05593a47cc0cd1c0b755a418afff2cba984 (patch)
tree068b2c3c136833ab5906328c2cf633ed90a31fb3
parentLower the step size for the TFTP timeout. (diff)
downloadrtems-tools-3c7cd05593a47cc0cd1c0b755a418afff2cba984.tar.bz2
tester: Fix the TFTP ok to kill deadlock.
-rw-r--r--tester/rt/config.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/tester/rt/config.py b/tester/rt/config.py
index b423a5a..a19cc6c 100644
--- a/tester/rt/config.py
+++ b/tester/rt/config.py
@@ -92,7 +92,9 @@ class file(config.file):
self.capture('*** TIMEOUT TIMEOUT')
def _ok_kill(self):
+ self._lock()
self.kill_good = True
+ self._unlock()
try:
self.process.kill()
except:
@@ -281,9 +283,9 @@ class file(config.file):
self.output += text
if reset_target:
self._target_reset()
+ self._unlock()
if ok_to_kill:
self._ok_kill()
- self._unlock()
def capture_console(self, text):
self._lock()