* tests:

  - Fix new tests from Sebastian to work with Python 2.6

2 files changed, 15 insertions, 3 deletions

diff --git a/tests/test_auth.py b/tests/test_auth.py
index f975c670..99c40db5 100644
--- a/tests/test_auth.py
+++ b/tests/test_auth.py
@@ -7,7 +7,7 @@ import tempfile
 import time
 import unittest
 
-if sys.version_info.major > 2:
+if sys.version_info[0] > 2:
     from http.server import HTTPServer
     from http.server import SimpleHTTPRequestHandler as HTTPRequestHandler
 else:
@@ -107,6 +107,18 @@ class TestAuthKeys(unittest.TestCase):
 
     """Test handling of keys for signed repositories."""
 
+    if sys.version_info[0] == 2 and sys.version_info[1] < 7:
+        def addCleanup(self, function, *args, **kwds):
+            try:
+                self.cleanup.append(lambda: function(*args, **kwds))
+            except AttributeError:
+                self.cleanup = [lambda: function(*args, **kwds)]
+
+        def tearDown(self):
+            for f in self.cleanup:
+                f()
+            self.cleanup = []
+
     def setUp(self):
         # reset any config manipulations done in the individual tests
         apt_pkg.init_config()
diff --git a/tests/test_lp659438.py b/tests/test_lp659438.py
index 01edf3bd..4564f0f6 100644
--- a/tests/test_lp659438.py
+++ b/tests/test_lp659438.py
@@ -39,8 +39,7 @@ class RegressionTestCase(unittest.TestCase):
 
     def setUp(self):
         apt_pkg.init_config()
-        chroot_path = tempfile.mkdtemp()
-        self.addCleanup(lambda: shutil.rmtree(chroot_path))
+        self.chroot_path = chroot_path = tempfile.mkdtemp()
         # Create a damaged status file
         self.cache = apt.cache.Cache(rootdir=chroot_path)
         with open(apt_pkg.config.find_file("Dir::State::status"),
@@ -62,6 +61,7 @@ Version: 3.6.9+build1+nobinonly-0ubuntu1""")
         # this resets the rootdir apt_pkg.config to ensure it does not
         # "pollute" the later tests
         cache = apt.cache.Cache(rootdir="/")
+        shutil.rmtree(self.chroot_path)
 
     def test_survive_reqreinst(self):
         """Test that we survive a package in require reinstallation state"""