acquire: Use priority queues and a 3 stage pipeline design

[apt.git] / test / integration / test-multiarch-foreign

diff --git a/test/integration/test-multiarch-foreign b/test/integration/test-multiarch-foreign
index a266e35eddabf9fe5d03cce2d8c1b5ea899d03e3..713b27bd4de2676ac67586434c361ed6ec547336 100755 (executable)
--- a/test/integration/test-multiarch-foreign
+++ b/test/integration/test-multiarch-foreign
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
 #!/bin/sh
 set -e
 

-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"

 setupenvironment
 configarchitecture 'amd64' 'i386' 'armel'
 
 setupenvironment
 configarchitecture 'amd64' 'i386' 'armel'
 


@@ -27,7 +27,7 @@ setupaptarchive
 
 testsuccessequal 'Reading package lists...
 Building dependency tree...
 
 testsuccessequal 'Reading package lists...
 Building dependency tree...

-The following extra packages will be installed:
+The following additional packages will be installed:

   foo
 The following NEW packages will be installed:
   cool-foo:i386 foo
   foo
 The following NEW packages will be installed:
   cool-foo:i386 foo


@@ -59,7 +59,7 @@ Conf cool-foo (1.0 unstable [amd64])' aptget install cool-foo:amd64 foo:armel -s
 
 testsuccessequal 'Reading package lists...
 Building dependency tree...
 
 testsuccessequal 'Reading package lists...
 Building dependency tree...

-The following extra packages will be installed:
+The following additional packages will be installed:

   bar
 The following NEW packages will be installed:
   bar cool-bar:i386
   bar
 The following NEW packages will be installed:
   bar cool-bar:i386


@@ -98,12 +98,12 @@ The following NEW packages will be installed:
 Inst bar:i386 (1.0 unstable [i386])
 Inst cool-bar (1.0 unstable [amd64])
 Conf bar:i386 (1.0 unstable [i386])
 Inst bar:i386 (1.0 unstable [i386])
 Inst cool-bar (1.0 unstable [amd64])
 Conf bar:i386 (1.0 unstable [i386])

-Conf cool-bar (1.0 unstable [amd64])" aptget install cool-bar bar-provider:i386 -s -q=0
+Conf cool-bar (1.0 unstable [amd64])" aptget install cool-bar bar-provider:i386 -s

 
 satisfiable_in_singlearch() {
        testsuccessequal 'Reading package lists...
 Building dependency tree...
 
 satisfiable_in_singlearch() {
        testsuccessequal 'Reading package lists...
 Building dependency tree...

-The following extra packages will be installed:
+The following additional packages will be installed:

   foo
 The following NEW packages will be installed:
   cool-foo foo
   foo
 The following NEW packages will be installed:
   cool-foo foo


@@ -125,7 +125,7 @@ Conf cool-foo (1.0 unstable [amd64])' aptget install cool-foo:amd64 foo:amd64 -s
 
        testsuccessequal 'Reading package lists...
 Building dependency tree...
 
        testsuccessequal 'Reading package lists...
 Building dependency tree...

-The following extra packages will be installed:
+The following additional packages will be installed:

   bar
 The following NEW packages will be installed:
   bar cool-bar
   bar
 The following NEW packages will be installed:
   bar cool-bar


@@ -154,11 +154,11 @@ The following NEW packages will be installed:
 Inst bar (1.0 unstable [amd64])
 Inst cool-bar (1.0 unstable [amd64])
 Conf bar (1.0 unstable [amd64])
 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 bar-provider -s -q=0
+Conf cool-bar (1.0 unstable [amd64])" aptget install cool-bar bar-provider -s

 
        testsuccessequal 'Reading package lists...
 Building dependency tree...
 
        testsuccessequal 'Reading package lists...
 Building dependency tree...

-The following extra packages will be installed:
+The following additional packages will be installed:

   foo
 The following NEW packages will be installed:
   cool-foo-x64 foo
   foo
 The following NEW packages will be installed:
   cool-foo-x64 foo


@@ -186,44 +186,48 @@ The following packages have unmet dependencies:
 E: Unable to correct problems, you have held broken packages." aptget install $1 hates-foo -s
        testfailureequal "$BADPREFIX
 The following packages have unmet dependencies:
 E: Unable to correct problems, you have held broken packages." aptget install $1 hates-foo -s
        testfailureequal "$BADPREFIX
 The following packages have unmet dependencies:

- hates-foo-x64 : Conflicts: foo
-E: Unable to correct problems, you have held broken packages." aptget install $1 hates-foo-x64 -s
-       testfailureequal "$BADPREFIX
-The following packages have unmet dependencies:
- hates-foo-x32 : Conflicts: foo:i386
-E: Unable to correct problems, you have held broken packages." aptget install $1 hates-foo-x32 -s
+ $2 : Conflicts: foo:$4
+E: Unable to correct problems, you have held broken packages." aptget install $1 $2 -s
+       testsuccessequal "Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  $1 $3
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst $1 (1.0 unstable [$4])
+Inst $3 (1.0 unstable [amd64])
+Conf $1 (1.0 unstable [$4])
+Conf $3 (1.0 unstable [amd64])" aptget install $1 $3 -s

 }
 }

-hatersgonnahate 'foo'
-hatersgonnahate 'foo:i386'
+hatersgonnahate 'foo' 'hates-foo-x64' 'hates-foo-x32' 'amd64'
+hatersgonnahate 'foo:i386' 'hates-foo-x32' 'hates-foo-x64' 'i386'

 
 

-#FIXME: do not work in single-arch as i386 isn't known at cache generation time

        testsuccessequal 'Reading package lists...
 Building dependency tree...
        testsuccessequal 'Reading package lists...
 Building dependency tree...

-The following extra packages will be installed:
-  foo
+The following additional packages will be installed:
+  foo:i386

 The following NEW packages will be installed:
 The following NEW packages will be installed:

-  cool-foo-x32 foo
+  cool-foo-x32 foo:i386

 0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
 0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.

-Inst foo (1.0 unstable [amd64])
+Inst foo:i386 (1.0 unstable [i386])

 Inst cool-foo-x32 (1.0 unstable [amd64])
 Inst cool-foo-x32 (1.0 unstable [amd64])

-Conf foo (1.0 unstable [amd64])
+Conf foo:i386 (1.0 unstable [i386])

 Conf cool-foo-x32 (1.0 unstable [amd64])' aptget install cool-foo-x32 -s
 
        testsuccessequal 'Reading package lists...
 Building dependency tree...
 Conf cool-foo-x32 (1.0 unstable [amd64])' aptget install cool-foo-x32 -s
 
        testsuccessequal 'Reading package lists...
 Building dependency tree...

-The following extra packages will be installed:
-  bar
+The following additional packages will be installed:
+  bar:i386

 The following NEW packages will be installed:
 The following NEW packages will be installed:

-  bar cool-bar-x32
+  bar:i386 cool-bar-x32

 0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
 0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.

-Inst bar (1.0 unstable [amd64])
+Inst bar:i386 (1.0 unstable [i386])

 Inst cool-bar-x32 (1.0 unstable [amd64])
 Inst cool-bar-x32 (1.0 unstable [amd64])

-Conf bar (1.0 unstable [amd64])
-Conf cool-bar-x32 (1.0 unstable [amd64])' aptget install cool-bar-x32 -s -q=0
+Conf bar:i386 (1.0 unstable [i386])
+Conf cool-bar-x32 (1.0 unstable [amd64])' aptget install cool-bar-x32 -s

 
        testsuccessequal 'Reading package lists...
 Building dependency tree...
 
        testsuccessequal 'Reading package lists...
 Building dependency tree...

-The following extra packages will be installed:
+The following additional packages will be installed:

   bar
 The following NEW packages will be installed:
   bar cool-bar-x64
   bar
 The following NEW packages will be installed:
   bar cool-bar-x64


@@ -231,7 +235,7 @@ The following NEW packages will be installed:
 Inst bar (1.0 unstable [amd64])
 Inst cool-bar-x64 (1.0 unstable [amd64])
 Conf bar (1.0 unstable [amd64])
 Inst bar (1.0 unstable [amd64])
 Inst cool-bar-x64 (1.0 unstable [amd64])
 Conf bar (1.0 unstable [amd64])

-Conf cool-bar-x64 (1.0 unstable [amd64])' aptget install cool-bar-x64 -s -q=0
+Conf cool-bar-x64 (1.0 unstable [amd64])' aptget install cool-bar-x64 -s

 
 
 satisfiable_in_singlearch
 
 
 satisfiable_in_singlearch


@@ -240,3 +244,44 @@ msgmsg 'switch to single architecture'
 configarchitecture 'amd64'
 
 satisfiable_in_singlearch
 configarchitecture 'amd64'
 
 satisfiable_in_singlearch

+
+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:
+  foo
+The following packages will be REMOVED:
+  foo:armhf
+The following NEW packages will be installed:
+  cool-foo foo
+0 upgraded, 2 newly installed, 1 to remove and 0 not upgraded.
+Remv foo:armhf [1.0]
+Inst foo (1.0 unstable [amd64])
+Inst cool-foo (1.0 unstable [amd64])
+Conf foo (1.0 unstable [amd64])
+Conf cool-foo (1.0 unstable [amd64])' aptget install cool-foo -s
+testsuccessequal 'Reading package lists...
+Building dependency tree...
+The following additional packages will be installed:
+  bar
+The following packages will be REMOVED:
+  bar:armhf
+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] [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