Rev 5169: (lifeless) Avoid zombies for selftest --parallel=fork (Vincent Ladeuil) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5169 [merge]
revision-id: pqm at pqm.ubuntu.com-20100421050502-7540qdf2nxuvlq0c
parent: pqm at pqm.ubuntu.com-20100420103030-1jqyxyc47v1btkp2
parent: v.ladeuil+lp at free.fr-20100420064706-2y3zb0cavelx9rdp
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2010-04-21 06:05:02 +0100
message:
  (lifeless) Avoid zombies for selftest --parallel=fork (Vincent Ladeuil)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
=== modified file 'NEWS'
--- a/NEWS	2010-04-20 10:30:30 +0000
+++ b/NEWS	2010-04-21 05:05:02 +0000
@@ -42,6 +42,9 @@
   into the master branch will no longer claim that old commits have become
   pending merges. (Robert Collins, #562079)
 
+* ``bzr selftest --parallel=fork`` wait for its children avoiding zombies.
+  (Vincent Ladeuil, #566670)
+
 * ``bzrlib.mutabletree.MutableTree.commit`` will now support a passed in
   config as in previous versions of bzrlib. (Robert Collins)
 

=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2010-04-20 03:00:52 +0000
+++ b/bzrlib/tests/__init__.py	2010-04-21 05:05:02 +0000
@@ -3212,7 +3212,7 @@
             try:
                 ProtocolTestCase.run(self, result)
             finally:
-                os.waitpid(self.pid, os.WNOHANG)
+                os.waitpid(self.pid, 0)
 
     test_blocks = partition_tests(suite, concurrency)
     for process_tests in test_blocks: