summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-08-05 13:33:38 -0700
committerZac Medico <zmedico@gentoo.org>2010-08-05 13:37:33 -0700
commita082e60d36af81d908e1fa185032c5da1e270375 (patch)
tree7620c6858c15410acfac225d1cca126136c7ad45
parentTests: Add resolver/test_eapi (2 tests disabled) (diff)
downloadportage-multirepo-a082e60d36af81d908e1fa185032c5da1e270375.tar.gz
portage-multirepo-a082e60d36af81d908e1fa185032c5da1e270375.tar.bz2
portage-multirepo-a082e60d36af81d908e1fa185032c5da1e270375.zip
Use a ResolverPlayground.cleanup() method to cleanup temporary directories.
-rw-r--r--pym/portage/tests/resolver/ResolverPlayground.py4
-rw-r--r--pym/portage/tests/resolver/test_eapi.py12
-rw-r--r--pym/portage/tests/resolver/test_simple.py12
3 files changed, 20 insertions, 8 deletions
diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/portage/tests/resolver/ResolverPlayground.py
index 643a3b61..9034deb8 100644
--- a/pym/portage/tests/resolver/ResolverPlayground.py
+++ b/pym/portage/tests/resolver/ResolverPlayground.py
@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
from itertools import chain
+import shutil
import tempfile
import portage
from portage import os
@@ -192,3 +193,6 @@ class ResolverPlayground(object):
else:
#TODO: Use mydepgraph.display_problems() to return a useful error message
return False, None
+
+ def cleanup(self):
+ shutil.rmtree(self.root)
diff --git a/pym/portage/tests/resolver/test_eapi.py b/pym/portage/tests/resolver/test_eapi.py
index f2eff44d..19c7b219 100644
--- a/pym/portage/tests/resolver/test_eapi.py
+++ b/pym/portage/tests/resolver/test_eapi.py
@@ -92,7 +92,11 @@ class SimpleResolverTestCase(TestCase):
)
playground = ResolverPlayground(ebuilds=ebuilds)
-
- for atoms, options, action, expected_result, expected_mergelist in requests:
- success, mergelist = playground.run(atoms, options, action)
- self.assertEqual((success, mergelist), (expected_result, expected_mergelist))
+ try:
+ for atoms, options, action, \
+ expected_result, expected_mergelist in requests:
+ success, mergelist = playground.run(atoms, options, action)
+ self.assertEqual((success, mergelist),
+ (expected_result, expected_mergelist))
+ finally:
+ playground.cleanup()
diff --git a/pym/portage/tests/resolver/test_simple.py b/pym/portage/tests/resolver/test_simple.py
index c092129b..0e77c9e6 100644
--- a/pym/portage/tests/resolver/test_simple.py
+++ b/pym/portage/tests/resolver/test_simple.py
@@ -24,7 +24,11 @@ class SimpleResolverTestCase(TestCase):
)
playground = ResolverPlayground(ebuilds=ebuilds, installed=installed)
-
- for atoms, options, action, expected_result, expected_mergelist in requests:
- success, mergelist = playground.run(atoms, options, action)
- self.assertEqual((success, mergelist), (expected_result, expected_mergelist))
+ try:
+ for atoms, options, action, \
+ expected_result, expected_mergelist in requests:
+ success, mergelist = playground.run(atoms, options, action)
+ self.assertEqual((success, mergelist),
+ (expected_result, expected_mergelist))
+ finally:
+ playground.cleanup()