merged from lp:~mvo/python-apt/mvo

1 files changed, 6 insertions, 1 deletions

diff --git a/tests/test_apt_cache.py b/tests/test_apt_cache.py
index 83d30ff3..e020b2e5 100644
--- a/tests/test_apt_cache.py
+++ b/tests/test_apt_cache.py
@@ -22,6 +22,10 @@ import shutil
 class TestAptCache(unittest.TestCase):
     """ test the apt cache """
 
+    def setUp(self):
+        # reset any config manipulations done in the individual tests
+        apt_pkg.init_config()
+
     def testAptCache(self):
         """cache: iterate all packages and all dependencies """
         cache = apt.Cache()
@@ -101,7 +105,8 @@ class TestAptCache(unittest.TestCase):
 
     def test_apt_update(self):
         rootdir = "./data/tmp"
-        shutil.rmtree(rootdir)
+        if os.path.exists(rootdir):
+	    shutil.rmtree(rootdir)
         try:
             os.makedirs(os.path.join(rootdir, "var/lib/apt/lists/partial"))
         except OSError, e: