From 0409655e64e43a022950748cca2494b9846af97a Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Thu, 4 Apr 2019 16:43:12 +0200 Subject: process: Early return during process termination if no proc running This avoids extra unneeded logging about killing with signal when actually no signal is being sent. Change-Id: I5b5dd78fe3301d8eef2ab93da3b37029268ae198 --- src/osmo_gsm_tester/process.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/osmo_gsm_tester/process.py') diff --git a/src/osmo_gsm_tester/process.py b/src/osmo_gsm_tester/process.py index 441d4ea..66ecae5 100644 --- a/src/osmo_gsm_tester/process.py +++ b/src/osmo_gsm_tester/process.py @@ -104,7 +104,10 @@ class ParallelTerminationStrategy(TerminationStrategy): time.sleep(wait_step) def terminate_all(self): - self.dbg("Scheduled to terminate %d processes." % len(self._processes)) + num_processes = len(self._processes) + self.dbg("Scheduled to terminate %d processes." % num_processes) + if num_processes == 0: + return self._prune_dead_processes(True) self._build_process_map() @@ -116,6 +119,8 @@ class ParallelTerminationStrategy(TerminationStrategy): if sig == signal.SIGKILL: continue self._poll_for_termination() + if len(self._processes) == 0: + return class Process(log.Origin): -- cgit v1.2.3