* lp:~mvo/python-apt/debfile-multiarch:

  - add multiarch support to the debfile.py code

3 files changed, 57 insertions, 11 deletions

diff --git a/tests/data/test_debs/multiarch-test1_i386.deb b/tests/data/test_debs/multiarch-test1_i386.deb
new file mode 100644
index 00000000..439a9f46
--- /dev/null
+++ b/tests/data/test_debs/multiarch-test1_i386.deb
diff --git a/tests/test_debfile.py b/tests/test_debfile.py
index af04af26..04a6b65a 100644
--- a/tests/test_debfile.py
+++ b/tests/test_debfile.py
@@ -17,8 +17,8 @@ sys.path.insert(0, get_library_dir())
 import apt_pkg
 import apt.debfile
 
-class TestDebfilee(unittest.TestCase):
-    """ test the apt cache """
+class TestDebfile(unittest.TestCase):
+    """ test the debfile """
 
     TEST_DEBS = [
         # conflicts with apt
@@ -131,15 +131,6 @@ Description: testpackage for gdebi - contains usr/bin/binary for file reading
 	# we need to support python2.6
         self.assertTrue(raised)
 
-    def test_multiarch_deb(self):
-        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")
-        res = deb.check()
-        # FIXME: do something sensible with the multiarch test
-
-
 
 if __name__ == "__main__":
     #logging.basicConfig(level=logging.DEBUG)
diff --git a/tests/test_debfile_multiarch.py b/tests/test_debfile_multiarch.py
new file mode 100644
index 00000000..7c02a32a
--- /dev/null
+++ b/tests/test_debfile_multiarch.py
@@ -0,0 +1,55 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2010 Michael Vogt <mvo@ubuntu.com>
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.
+"""Unit tests for verifying the correctness of DebPackage in apt.debfile."""
+import os
+import logging
+import unittest
+
+from test_all import get_library_dir
+import sys
+sys.path.insert(0, get_library_dir())
+import apt
+import apt_pkg
+import apt.debfile
+
+class TestDebfileMultiarch(unittest.TestCase):
+    """ test the multiarch debfile """
+
+    def test_multiarch_deb_check(self):
+        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")
+        missing = deb.missing_deps
+        #print missing
+        self.assertFalse("dpkg:i386" in missing)
+
+    def test_multiarch_conflicts(self):
+        cache = apt.Cache()
+        # WARNING: this assumes that lib3ds-1-3 is a non-multiarch lib
+        # use "lib3ds-1-3" as a test to see if non-multiach lib conflicts work
+        canary = "lib3ds-1-3"
+        if not canary in cache:
+            logging.warn("skipping test because %s is missing" % canary)
+            return
+        cache[canary].mark_install()
+        deb = apt.debfile.DebPackage(
+            "./data/test_debs/multiarch-test1_i386.deb", cache=cache)
+        # this deb should now not be installable
+        installable = deb.check()
+        #print deb._failure_string
+        self.assertFalse(installable)
+        self.assertEqual(deb._failure_string, 
+                         "Conflicts with the installed package 'lib3ds-1-3'")
+
+
+
+if __name__ == "__main__":
+    unittest.main()