Skip to content

Commit e96a823

Browse files
authored
Fix[IT]: fix zombie broker and output mess (#887)
Signed-off-by: Anton Pryakhin <[email protected]>
1 parent 112db4e commit e96a823

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

src/integration-tests/test_connection_loss.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -178,12 +178,6 @@ def test_force_leader_primary_divergence(
178178
assert rc == 0
179179

180180
# Restart "east1"
181-
old_leader = Broker(
182-
old_leader,
183-
cluster=cluster,
184-
cwd=cluster.work_dir / old_leader.name,
185-
)
186-
old_leader.add_sync_log_hook(lambda _: cluster.check_processes())
187181
old_leader.start()
188182
old_leader.wait_until_started()
189183

src/python/blazingmq/dev/it/process/proc.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ def __init__(
137137
self,
138138
name,
139139
command,
140-
stdin=None,
140+
stdin=subprocess.DEVNULL,
141141
read_timeout=5.0,
142142
wait_timeout=15.0,
143143
check_exit_code=True,
@@ -459,11 +459,9 @@ def wait(self, timeout: Optional[float] = None) -> int:
459459
except subprocess.TimeoutExpired:
460460
return 1
461461

462-
self._internal_logger.debug(
463-
"waiting for stdout consuming thread to exit..."
464-
)
465-
self._stdout_thread.join()
466-
self._stderr_thread.join()
462+
self._internal_logger.debug("waiting for stdout consuming thread to exit...")
463+
self._stdout_thread.join()
464+
self._stderr_thread.join()
467465

468466
if self.check_exit_code:
469467
if not self.is_alive() and self.returncode != 0:

0 commit comments

Comments
 (0)