summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2016-01-14 20:13:16 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2016-01-14 23:08:02 +0100
commit62428dbc17ffa7b5b8188e88609a9438428d6024 (patch)
tree5b4fb96209bd4f2bd8af80e09389d7ccc3222289 /test
parentfa47f406cf434e175885c5920175c0cedcd62746 (diff)
fix M-A:foreign provides creation for unknown archs
Architectures for packages which do not belong to the native nor a foreign architecture (dubbed barbarian for now) which are marked M-A:foreign still provide in their own architecture even if not for others. Also, other M-A:foreign (and allowed) packages provide in these barbarian architectures.
Diffstat (limited to 'test')
-rwxr-xr-xtest/integration/test-multiarch-allowed4
-rwxr-xr-xtest/integration/test-multiarch-foreign8
2 files changed, 10 insertions, 2 deletions
diff --git a/test/integration/test-multiarch-allowed b/test/integration/test-multiarch-allowed
index 4f3aeeaa5..98555bc73 100755
--- a/test/integration/test-multiarch-allowed
+++ b/test/integration/test-multiarch-allowed
@@ -255,7 +255,9 @@ configarchitecture 'amd64' 'i386'
insertinstalledpackage 'foo' 'armel' '1' 'Multi-Arch: allowed'
insertinstalledpackage 'coolfoo' 'armel' '1' 'Multi-Arch:allowed
Provides: coolbar'
+insertinstalledpackage 'bar-needer' 'armel' '1.0' 'Depends: coolbar:any'
+testsuccess aptget check
testsuccessequal 'Reading package lists...
Building dependency tree...
The following additional packages will be installed:
@@ -293,7 +295,7 @@ The following packages will be REMOVED:
The following NEW packages will be installed:
coolfoo needscoolfoover0
0 upgraded, 2 newly installed, 1 to remove and 0 not upgraded.
-Remv coolfoo:armel [1]
+Remv coolfoo:armel [1] [bar-needer:armel ]
Inst coolfoo (1 unstable [amd64])
Inst needscoolfoover0 (1 unstable [amd64])
Conf coolfoo (1 unstable [amd64])
diff --git a/test/integration/test-multiarch-foreign b/test/integration/test-multiarch-foreign
index 5daef4ad1..713b27bd4 100755
--- a/test/integration/test-multiarch-foreign
+++ b/test/integration/test-multiarch-foreign
@@ -250,7 +250,9 @@ msgmsg 'switch to multi-arch with barbarian architecture'
insertinstalledpackage 'foo' 'armhf' '1.0' 'Multi-Arch: foreign'
insertinstalledpackage 'bar' 'armhf' '1.0' 'Provides: bar-provider
Multi-Arch: foreign'
+insertinstalledpackage 'bar-needer' 'armhf' '1.0' 'Depends: bar-provider'
+testsuccess aptget check
testsuccessequal 'Reading package lists...
Building dependency tree...
The following additional packages will be installed:
@@ -274,8 +276,12 @@ The following packages will be REMOVED:
The following NEW packages will be installed:
bar cool-bar
0 upgraded, 2 newly installed, 1 to remove and 0 not upgraded.
-Remv bar:armhf [1.0]
+Remv bar:armhf [1.0] [bar-needer:armhf ]
Inst bar (1.0 unstable [amd64])
Inst cool-bar (1.0 unstable [amd64])
Conf bar (1.0 unstable [amd64])
Conf cool-bar (1.0 unstable [amd64])' aptget install cool-bar -s
+
+# a barbarian doesn't satisfy another either
+insertinstalledpackage 'bar-needer2' 's390x' '1.0' 'Depends: bar-provider'
+testfailure aptget check