merged from debian-sid

2 files changed, 5 insertions, 2 deletions

diff --git a/tests/test_apt_cache.py b/tests/test_apt_cache.py
index cfb3ab99..cccfc9c8 100644
--- a/tests/test_apt_cache.py
+++ b/tests/test_apt_cache.py
@@ -47,10 +47,10 @@ class TestAptCache(unittest.TestCase):
                 # particular, when using compressed indexes, it should not use
                 # tons of seek operations
                 r = pkg.candidate.record
-                self.assertEqual(r['Package'], pkg.name)
+                self.assertEqual(r['Package'], pkg.shortname)
                 self.assert_('Version' in r)
                 self.assert_(len(r['Description']) > 0)
-                self.assert_(str(r).startswith('Package: %s\n' % pkg.name))
+                self.assert_(str(r).startswith('Package: %s\n' % pkg.shortname))
 
     def test_get_provided_packages(self):
         cache = apt.Cache()
diff --git a/tests/test_debfile.py b/tests/test_debfile.py
index 426bccde..5f6d1aa2 100644
--- a/tests/test_debfile.py
+++ b/tests/test_debfile.py
@@ -47,6 +47,9 @@ class TestDebfilee(unittest.TestCase):
     def setUp(self):
         apt_pkg.init_config()
         apt_pkg.config.set("APT::Architecture","i386")
+        # FIXME: When run via test_all.py, the tests fail without this if it
+        # is set in the system.
+        apt_pkg.config.clear("APT::Architectures")
         apt_pkg.config.set("Dir::State::status", 
                            "./data/test_debs/var/lib/dpkg/status")
         apt_pkg.config.set("Dir::State::lists",