Skip to content

[3.6] bpo-31160: Backport reap_children() fixes from master to 3.6 #3046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vstinner wants to merge 2 commits into from
Closed

[3.6] bpo-31160: Backport reap_children() fixes from master to 3.6 #3046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c855914
bpo-31160: Fix test_builtin for zombie process (#3043)
vstinner Aug 9, 2017
b9617cc
bpo-31160: regrtest now reaps child processes (#3044)
vstinner Aug 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Lib/test/libregrtest/runtest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,10 @@ def runtest(ns, test):
runtest.stringio = None


def post_test_cleanup():
support.reap_children()


def runtest_inner(ns, test, display_failure=True):
support.unload(test)

Expand Down Expand Up @@ -170,6 +174,7 @@ def test_runner():
if ns.huntrleaks:
refleak = dash_R(the_module, test, test_runner, ns.huntrleaks)
test_time = time.time() - start_time
post_test_cleanup()
except support.ResourceDenied as msg:
if not ns.quiet and not ns.pgo:
print(test, "skipped --", msg, flush=True)
Expand Down
4 changes: 4 additions & 0 deletions Lib/test/test_builtin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1560,6 +1560,10 @@ def run_child(self, child, terminal_input):
self.fail("got %d lines in pipe but expected 2, child output was:\n%s"
% (len(lines), child_output))
os.close(fd)

pid, status = os.waitpid(pid, 0)
self.assertEqual(status, 0)

return lines

def check_input_tty(self, prompt, terminal_input, stdio_encoding=None):
Expand Down