Skip to content

Commit

Permalink
Revert "umu_test: use Popen.wait when waiting for subprocess"
Browse files Browse the repository at this point in the history
This reverts commit 955ffe9.
  • Loading branch information
R1kaB3rN committed May 29, 2024
1 parent 955ffe9 commit 4a3c732
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions umu/umu_run.py
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,6 @@ def run_command(command: list[str]) -> int:
c_int,
] = None
proc: Popen = None
ret: int = 0
libc: str = get_libc()

if not command:
Expand Down Expand Up @@ -407,10 +406,17 @@ def run_command(command: list[str]) -> int:
start_new_session=True,
preexec_fn=lambda: prctl(PR_SET_CHILD_SUBREAPER, 1, 0, 0, 0, 0),
)
ret = proc.wait()
log.debug("Child %s exited with wait status: %s", proc.pid, ret)

return ret
while True:
try:
wait_pid, wait_status = os.waitpid(proc.pid, 0)
log.debug(
"Child %s exited with wait status: %s", wait_pid, wait_status
)
except ChildProcessError: # No more children
break

return proc.returncode


def main() -> int: # noqa: D103
Expand Down

0 comments on commit 4a3c732

Please sign in to comment.