merged test-fixes from ubuntu (mostly for dep8)

1 files changed, 9 insertions, 5 deletions

diff --git a/tests/test_apt_cache.py b/tests/test_apt_cache.py
index 7e2ead2d..21dfeb98 100644
--- a/tests/test_apt_cache.py
+++ b/tests/test_apt_cache.py
@@ -23,7 +23,9 @@ else:
 
 
 from test_all import get_library_dir
-sys.path.insert(0, get_library_dir())
+libdir = get_library_dir()
+if libdir:
+    sys.path.insert(0, libdir)
 
 import apt
 import apt_pkg
@@ -34,7 +36,7 @@ def if_sources_list_is_readable(f):
         if os.access("/etc/apt/sources.list", os.R_OK):
             f(*args, **kwargs)
         else:
-            logging.warn("skipping '%s' because sources.list is not readable" % f)
+            logging.warning("skipping '%s' because sources.list is not readable" % f)
     return wrapper
 
 
@@ -42,7 +44,7 @@ def get_open_file_descriptors():
     try:
         fds = os.listdir("/proc/self/fd")
     except OSError:
-        logging.warn("failed to list /proc/self/fd")
+        logging.warning("failed to list /proc/self/fd")
         return set([])
     return set(map(int, fds))
 
@@ -57,6 +59,8 @@ class TestAptCache(TestCase):
         self._cnf = {}
         for item in apt_pkg.config.keys():
             self._cnf[item] = apt_pkg.config.find(item)
+        apt_pkg.config.clear("APT::Update::Post-Invoke")
+        apt_pkg.config.clear("APT::Update::Post-Invoke-Success")
 
     def tearDown(self):
         for item in self._cnf:
@@ -120,7 +124,7 @@ class TestAptCache(TestCase):
         cache = apt.Cache(rootdir="./data/test-provides/")
         cache.open()
         if len(cache) == 0:
-            logging.warn("skipping test_get_provided_packages, cache empty?!?")
+            logging.warning("skipping test_get_provided_packages, cache empty?!?")
             return
         # a true virtual pkg
         l = cache.get_providing_packages("mail-transport-agent")
@@ -133,7 +137,7 @@ class TestAptCache(TestCase):
         # create highlevel cache and get the lowlevel one from it
         highlevel_cache = apt.Cache(rootdir="./data/test-provides")
         if len(highlevel_cache) == 0:
-            logging.warn("skipping test_log_level_pkg_provides, cache empty?!?")
+            logging.warning("skipping test_log_level_pkg_provides, cache empty?!?")
             return
         # low level cache provides list of the pkg
         cache = highlevel_cache._cache