* tests/test_debfile.py:

 - properly setup fixture data to make debfile test pass 
   (closes: #588796)

3 files changed, 20 insertions, 5 deletions

diff --git a/apt/debfile.py b/apt/debfile.py
index f969f485..ea83c5b3 100644
--- a/apt/debfile.py
+++ b/apt/debfile.py
@@ -302,7 +302,7 @@ class DebPackage(object):
         """
         # show progress information as this step may take some time
         size = float(len(self._cache))
-        steps = int(size/50)
+        steps = max(int(size/50), 1)
         debver = self._sections["Version"]
         # store what we provide so that we can later check against that
         provides = [ x[0][0] for x in self.provides]
diff --git a/debian/changelog b/debian/changelog
index b44031b9..466913a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+python-apt (0.7.96.1) UNRELEASED; urgency=low
+
+  * tests/test_debfile.py:
+   - properly setup fixture data to make debfile test pass 
+     (closes: #588796)
+
+ -- Michael Vogt <mvo@debian.org>  Mon, 12 Jul 2010 14:14:51 +0200
+
 python-apt (0.7.96) unstable; urgency=low
 
   [ Michael Vogt ]
diff --git a/tests/test_debfile.py b/tests/test_debfile.py
index 56bbba9f..6af0cf1c 100644
--- a/tests/test_debfile.py
+++ b/tests/test_debfile.py
@@ -13,10 +13,9 @@ import unittest
 from test_all import get_library_dir
 import sys
 sys.path.insert(0, get_library_dir())
-
+import apt_pkg
 import apt.debfile
 
-
 class TestDebfilee(unittest.TestCase):
     """ test the apt cache """
 
@@ -44,13 +43,21 @@ class TestDebfilee(unittest.TestCase):
         ('gdebi-test10.deb', False),
     ]
 
+    def setUp(self):
+        apt_pkg.config.set("APT::Architecture","i386")
+        apt_pkg.config.set("Dir::State::status", 
+                           "./test_debs/var/lib/dpkg/status")
+        self.cache = apt.Cache()
+
     def testDebFile(self):
-        deb = apt.debfile.DebPackage()
+        deb = apt.debfile.DebPackage(cache=self.cache)
         for (filename, expected_res) in self.TEST_DEBS:
             logging.debug("testing %s, expecting %s" % (filename, expected_res))
             deb.open(os.path.join("test_debs", filename))
             res = deb.check()
-            self.assertEqual(res, expected_res)
+            self.assertEqual(res, expected_res,
+                "Unexpected result for package '%s' (got %s wanted %s)" % (
+                    filename, res, expected_res))
 
 if __name__ == "__main__":
     #logging.basicConfig(level=logging.DEBUG)