diff --git a/zuul/ansible/base/library/command.py b/zuul/ansible/base/library/command.py index a3b969d9d7..0c461b3ae5 100755 --- a/zuul/ansible/base/library/command.py +++ b/zuul/ansible/base/library/command.py @@ -474,7 +474,7 @@ def zuul_run_command(self, args, zuul_log_id, check_rc=False, close_fds=True, ex if t: t.join(10) with Console(zuul_log_id) as console: - if t.isAlive(): + if t.is_alive(): console.addLine("[Zuul] standard output/error still open " "after child exited") # ZUUL: stdout and stderr are in the console log file @@ -495,7 +495,7 @@ def zuul_run_command(self, args, zuul_log_id, check_rc=False, close_fds=True, ex finally: if t: with Console(zuul_log_id) as console: - if t.isAlive(): + if t.is_alive(): console.addLine("[Zuul] standard output/error still open " "after child exited") if fail_json_kwargs: diff --git a/zuul/lib/log_streamer.py b/zuul/lib/log_streamer.py index 16b7222789..9ed124c595 100644 --- a/zuul/lib/log_streamer.py +++ b/zuul/lib/log_streamer.py @@ -181,7 +181,7 @@ class LogStreamer(object): raise def stop(self): - if self.thd.isAlive(): + if self.thd.is_alive(): self.server.shutdown() self.server.server_close() self.thd.join()