From 3c7cd05593a47cc0cd1c0b755a418afff2cba984 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Thu, 21 Sep 2017 21:34:34 +1000 Subject: tester: Fix the TFTP ok to kill deadlock. --- tester/rt/config.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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() -- cgit v1.2.3