summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2011-04-06 10:22:53 +0200
committerJulian Andres Klode <jak@debian.org>2011-04-06 10:22:53 +0200
commit30a0dff267d9e99c25d5902e296fd115746e05c9 (patch)
treef2da2f051419c2038b3999734e1832a9b6c673dc /tests
parent82bd14484ffa3fbe0b68777402cb31000bd7dd22 (diff)
downloadpython-apt-30a0dff267d9e99c25d5902e296fd115746e05c9.tar.gz
aptsources: Allow insertion of new multi-arch entries
Diffstat (limited to 'tests')
-rw-r--r--tests/test_aptsources.py36
1 files changed, 36 insertions, 0 deletions
diff --git a/tests/test_aptsources.py b/tests/test_aptsources.py
index aeb2ce31..1597674e 100644
--- a/tests/test_aptsources.py
+++ b/tests/test_aptsources.py
@@ -62,6 +62,14 @@ class TestAptSources(unittest.TestCase):
"edgy",
["restricted"])
self.assertTrue(sources.list == before.list)
+
+ before = copy.deepcopy(sources)
+ sources.add("deb", "http://de.archive.ubuntu.com/ubuntu/",
+ "natty",
+ ["main"], architectures=["amd64", "i386"])
+ self.assertTrue(sources.list == before.list)
+
+
# test to add something new: multiverse
sources.add("deb", "http://de.archive.ubuntu.com/ubuntu/",
"edgy",
@@ -74,6 +82,34 @@ class TestAptSources(unittest.TestCase):
"multiverse" in entry.comps):
found = True
self.assertTrue(found)
+
+ # add a new natty entry without architecture specification
+ sources.add("deb", "http://de.archive.ubuntu.com/ubuntu/",
+ "natty",
+ ["multiverse"])
+ found = False
+ for entry in sources:
+ if (entry.type == "deb" and
+ entry.uri == "http://de.archive.ubuntu.com/ubuntu/" and
+ entry.dist == "natty" and
+ entry.architectures == [] and
+ "multiverse" in entry.comps):
+ found = True
+ self.assertTrue(found)
+
+ # Add universe to existing multi-arch line
+ sources.add("deb", "http://de.archive.ubuntu.com/ubuntu/",
+ "natty",
+ ["universe"], architectures=["i386", "amd64"])
+ found = False
+ for entry in sources:
+ if (entry.type == "deb" and
+ entry.uri == "http://de.archive.ubuntu.com/ubuntu/" and
+ entry.dist == "natty" and
+ set(entry.architectures) == set(["amd64", "i386"]) and
+ set(entry.comps) == set(["main", "universe"])):
+ found = True
+ self.assertTrue(found)
# test to add something new: multiverse *and*
# something that is already there
before = copy.deepcopy(sources)