diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-10-08 09:07:08 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-10-08 09:07:08 -0700 |
| commit | ad177e7083c89e259df95947f3de47be96dbbf56 (patch) | |
| tree | 6d8caca40c3dc9338009e5be5d58fb892ae5b824 | |
| parent | dd81d7cd798d223f559a4fb885f8cc52e2881c81 (diff) | |
| download | portage-ad177e7083c89e259df95947f3de47be96dbbf56.tar.gz portage-ad177e7083c89e259df95947f3de47be96dbbf56.tar.bz2 portage-ad177e7083c89e259df95947f3de47be96dbbf56.zip | |
Revert "test_ipc_daemon: handle fork/finally race"
This reverts commit 56fbe3fe63adf4e7c5b47400182cd857d145d5b0.
The race is now handled internally by spawn and ForkProcess.
| -rw-r--r-- | pym/portage/tests/ebuild/test_ipc_daemon.py | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/pym/portage/tests/ebuild/test_ipc_daemon.py b/pym/portage/tests/ebuild/test_ipc_daemon.py index b88fce695..a87107625 100644 --- a/pym/portage/tests/ebuild/test_ipc_daemon.py +++ b/pym/portage/tests/ebuild/test_ipc_daemon.py @@ -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) |