summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-09-14 16:40:13 -0700
committerZac Medico <zmedico@gentoo.org>2010-09-14 16:40:13 -0700
commit1d3b4759b419fb4973d9f43c4a58ed7e8f8d7814 (patch)
treeb7566667128fcbe3aab202ce7bde308cdb8cb969
parentMake ebuild-ipc.py close the output_file before trying to re-open it (diff)
downloadportage-2.2_rc82.tar.gz
portage-2.2_rc82.tar.bz2
portage-2.2_rc82.zip
Make IpcDaemonTestCase use a finally block to unlock PORTAGE_BUILDDIR.v2.2_rc82
-rw-r--r--pym/portage/tests/ebuild/test_ipc_daemon.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/pym/portage/tests/ebuild/test_ipc_daemon.py b/pym/portage/tests/ebuild/test_ipc_daemon.py
index 4c9a614f8..b5b4796e1 100644
--- a/pym/portage/tests/ebuild/test_ipc_daemon.py
+++ b/pym/portage/tests/ebuild/test_ipc_daemon.py
@@ -23,6 +23,7 @@ class IpcDaemonTestCase(TestCase):
def testIpcDaemon(self):
tmpdir = tempfile.mkdtemp()
+ build_dir = None
try:
env = {}
@@ -117,6 +118,7 @@ class IpcDaemonTestCase(TestCase):
self.assertEqual(daemon.isAlive(), False)
self.assertEqual(proc.returncode == os.EX_OK, False)
- build_dir.unlock()
finally:
+ if build_dir is not None:
+ build_dir.unlock()
shutil.rmtree(tmpdir)