summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMichael Vogt <egon@debian-devbox>2011-12-01 14:13:28 +0100
committerMichael Vogt <egon@debian-devbox>2011-12-01 14:13:28 +0100
commitf0b627313d8c84116c860723a21d38b686a946ca (patch)
tree051a34a91c17964845a8dc26d79532f33558d8ee /tests
parentd76a13a50fda292fe011a86f2b761d5753dc1470 (diff)
parentd236f527f85b185144875e0e7ad9102c4c2dabd0 (diff)
downloadpython-apt-f0b627313d8c84116c860723a21d38b686a946ca.tar.gz
merged from lp:~mvo/apt/mvo
Diffstat (limited to 'tests')
-rw-r--r--tests/test_apt_cache.py4
-rw-r--r--tests/test_debfile.py5
-rw-r--r--tests/test_utils.py1
3 files changed, 4 insertions, 6 deletions
diff --git a/tests/test_apt_cache.py b/tests/test_apt_cache.py
index 74d94ed8..6ec04ed5 100644
--- a/tests/test_apt_cache.py
+++ b/tests/test_apt_cache.py
@@ -55,8 +55,8 @@ class TestAptCache(unittest.TestCase):
# that is possible and does not crash
for pkg in cache:
if pkg.candidate:
- for or_dep in pkg.candidate.dependencies:
- for dep in or_dep.or_dependencies:
+ for or_deps in pkg.candidate.dependencies:
+ for dep in or_deps:
self.assertTrue(dep.name)
self.assertTrue(isinstance(dep.relation, str))
self.assertTrue(dep.pre_depend in (True, False))
diff --git a/tests/test_debfile.py b/tests/test_debfile.py
index d7c38b3d..af04af26 100644
--- a/tests/test_debfile.py
+++ b/tests/test_debfile.py
@@ -132,13 +132,12 @@ Description: testpackage for gdebi - contains usr/bin/binary for file reading
self.assertTrue(raised)
def test_multiarch_deb(self):
- #print apt_pkg.get_architectures()
if apt_pkg.get_architectures() != ["amd64", "i386"]:
logging.warn("skipping test because running on a non-multiarch system")
return
deb = apt.debfile.DebPackage("./data/test_debs/multiarch-test1_i386.deb")
- #print deb.missing_deps()
-
+ res = deb.check()
+ # FIXME: do something sensible with the multiarch test
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 23511f32..26ee0bff 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -7,7 +7,6 @@
# notice and this notice are preserved.
import sys
-sys.path.insert(0, "..")
import apt_pkg
import apt.utils
import datetime