From faf4ad54785fa418b3c218ab0d2d2016c55d169a Mon Sep 17 00:00:00 2001 From: Andrey Zelenkov Date: Tue, 8 Oct 2019 00:28:40 +0300 Subject: [PATCH] Tests: increased subprocess timeout on Unit exit. Also changed order of subprocess status checks. _terminate_process() method removed. --- test/unit/main.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/test/unit/main.py b/test/unit/main.py index 873f1815..f5727726 100644 --- a/test/unit/main.py +++ b/test/unit/main.py @@ -240,24 +240,24 @@ class TestUnit(unittest.TestCase): break time.sleep(0.1) + self._p.join(timeout=5) + + if self._p.is_alive(): + self._p.terminate() + self._p.join(timeout=5) + + if self._p.is_alive(): + self.fail("Could not terminate process " + str(self._p.pid)) + if os.path.exists(self.testdir + '/unit.pid'): - exit("Could not terminate unit") + self.fail("Could not terminate unit") self._started = False - self._p.join(timeout=1) - self._terminate_process(self._p) - - def _terminate_process(self, process): - if process.is_alive(): - process.terminate() - process.join(timeout=5) - - if process.is_alive(): - exit("Could not terminate process " + process.pid) - - if process.exitcode: - exit("Child process terminated with code " + str(process.exitcode)) + if self._p.exitcode: + self.fail( + "Child process terminated with code " + str(self._p.exitcode) + ) def _check_alerts(self, log): found = False