Revert "test_ipc_daemon: handle fork/finally race"
authorZac Medico <zmedico@gentoo.org>
Mon, 8 Oct 2012 16:07:08 +0000 (09:07 -0700)
committerZac Medico <zmedico@gentoo.org>
Mon, 8 Oct 2012 16:07:08 +0000 (09:07 -0700)
This reverts commit 56fbe3fe63adf4e7c5b47400182cd857d145d5b0.
The race is now handled internally by spawn and ForkProcess.

pym/portage/tests/ebuild/test_ipc_daemon.py

index b88fce6955f36e368c441cbd9a7e42d43e366113..a871076259433fb61fe140d112d649d3158d5611 100644 (file)
@@ -36,7 +36,6 @@ class IpcDaemonTestCase(TestCase):
        def testIpcDaemon(self):
                event_loop = global_event_loop()
                tmpdir = tempfile.mkdtemp()
-               main_pid = os.getpid()
                build_dir = None
                try:
                        env = {}
@@ -136,14 +135,6 @@ class IpcDaemonTestCase(TestCase):
                                self.assertEqual(proc.returncode == os.EX_OK, False)
 
                finally:
-
-                       # Ensure that finally blocks don't run in forked subprocesses
-                       # before they are able to exec or _exit themselves, since the
-                       # fork might fail or be killed before it can setup its own
-                       # try/finally/_exit routine. See bug #345289.
-                       if os.getpid() != main_pid:
-                               os._exit(1)
-
                        if build_dir is not None:
                                build_dir.unlock()
                        shutil.rmtree(tmpdir)