check patch hashes in rred worker instead of in the handler

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

diff --git a/test/integration/test-multiarch-foreign b/test/integration/test-multiarch-foreign
index 240f1a4d1efa2c542264121d9534cc324df06291..7870126f51ea012ee163d2bb429f8753380fc25a 100755 (executable)
--- a/test/integration/test-multiarch-foreign
+++ b/test/integration/test-multiarch-foreign
@@ -19,7 +19,7 @@ Multi-Arch: foreign'
 
 setupaptarchive
 
 
 setupaptarchive
 

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following extra packages will be installed:
   foo
 Building dependency tree...
 The following extra packages will be installed:
   foo


@@ -31,7 +31,7 @@ Inst cool-foo:i386 (1.0 unstable [i386])
 Conf foo (1.0 unstable [amd64])
 Conf cool-foo:i386 (1.0 unstable [i386])' aptget install cool-foo:i386 -s
 
 Conf foo (1.0 unstable [amd64])
 Conf cool-foo:i386 (1.0 unstable [i386])' aptget install cool-foo:i386 -s
 

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following NEW packages will be installed:
   cool-foo foo:i386
 Building dependency tree...
 The following NEW packages will be installed:
   cool-foo foo:i386


@@ -41,7 +41,7 @@ Inst cool-foo (1.0 unstable [amd64])
 Conf foo:i386 (1.0 unstable [i386])
 Conf cool-foo (1.0 unstable [amd64])' aptget install cool-foo:amd64 foo:i386 -s
 
 Conf foo:i386 (1.0 unstable [i386])
 Conf cool-foo (1.0 unstable [amd64])' aptget install cool-foo:amd64 foo:i386 -s
 

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following NEW packages will be installed:
   cool-foo foo:armel
 Building dependency tree...
 The following NEW packages will be installed:
   cool-foo foo:armel


@@ -51,7 +51,7 @@ Inst cool-foo (1.0 unstable [amd64])
 Conf foo:armel (1.0 unstable [armel])
 Conf cool-foo (1.0 unstable [amd64])' aptget install cool-foo:amd64 foo:armel -s
 
 Conf foo:armel (1.0 unstable [armel])
 Conf cool-foo (1.0 unstable [amd64])' aptget install cool-foo:amd64 foo:armel -s
 

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following extra packages will be installed:
   bar
 Building dependency tree...
 The following extra packages will be installed:
   bar


@@ -63,7 +63,7 @@ Inst cool-bar:i386 (1.0 unstable [i386])
 Conf bar (1.0 unstable [amd64])
 Conf cool-bar:i386 (1.0 unstable [i386])' aptget install cool-bar:i386 -s
 
 Conf bar (1.0 unstable [amd64])
 Conf cool-bar:i386 (1.0 unstable [i386])' aptget install cool-bar:i386 -s
 

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following NEW packages will be installed:
   bar:i386 cool-bar
 Building dependency tree...
 The following NEW packages will be installed:
   bar:i386 cool-bar


@@ -73,7 +73,7 @@ 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:amd64 bar:i386 -s
 
 Conf bar:i386 (1.0 unstable [i386])
 Conf cool-bar (1.0 unstable [amd64])' aptget install cool-bar:amd64 bar:i386 -s
 

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following NEW packages will be installed:
   bar:armel cool-bar
 Building dependency tree...
 The following NEW packages will be installed:
   bar:armel cool-bar


@@ -83,7 +83,7 @@ Inst cool-bar (1.0 unstable [amd64])
 Conf bar:armel (1.0 unstable [armel])
 Conf cool-bar (1.0 unstable [amd64])' aptget install cool-bar:amd64 bar:armel -s
 
 Conf bar:armel (1.0 unstable [armel])
 Conf cool-bar (1.0 unstable [amd64])' aptget install cool-bar:amd64 bar:armel -s
 

-testequal "Reading package lists...
+testsuccessequal "Reading package lists...

 Building dependency tree...
 Note, selecting 'bar:i386' instead of 'bar-provider:i386'
 The following NEW packages will be installed:
 Building dependency tree...
 Note, selecting 'bar:i386' instead of 'bar-provider:i386'
 The following NEW packages will be installed:


@@ -95,7 +95,7 @@ Conf bar:i386 (1.0 unstable [i386])
 Conf cool-bar (1.0 unstable [amd64])" aptget install cool-bar bar-provider:i386 -s -q=0
 
 satisfiable_in_singlearch() {
 Conf cool-bar (1.0 unstable [amd64])" aptget install cool-bar bar-provider:i386 -s -q=0
 
 satisfiable_in_singlearch() {

-       testequal 'Reading package lists...
+       testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following extra packages will be installed:
   foo
 Building dependency tree...
 The following extra packages will be installed:
   foo


@@ -107,7 +107,7 @@ Inst cool-foo (1.0 unstable [amd64])
 Conf foo (1.0 unstable [amd64])
 Conf cool-foo (1.0 unstable [amd64])' aptget install cool-foo:amd64 -s
 
 Conf foo (1.0 unstable [amd64])
 Conf cool-foo (1.0 unstable [amd64])' aptget install cool-foo:amd64 -s
 

-       testequal 'Reading package lists...
+       testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following NEW packages will be installed:
   cool-foo foo
 Building dependency tree...
 The following NEW packages will be installed:
   cool-foo foo


@@ -117,7 +117,7 @@ Inst cool-foo (1.0 unstable [amd64])
 Conf foo (1.0 unstable [amd64])
 Conf cool-foo (1.0 unstable [amd64])' aptget install cool-foo:amd64 foo:amd64 -s
 
 Conf foo (1.0 unstable [amd64])
 Conf cool-foo (1.0 unstable [amd64])' aptget install cool-foo:amd64 foo:amd64 -s
 

-       testequal 'Reading package lists...
+       testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following extra packages will be installed:
   bar
 Building dependency tree...
 The following extra packages will be installed:
   bar


@@ -129,7 +129,7 @@ Inst cool-bar (1.0 unstable [amd64])
 Conf bar (1.0 unstable [amd64])
 Conf cool-bar (1.0 unstable [amd64])' aptget install cool-bar:amd64 -s
 
 Conf bar (1.0 unstable [amd64])
 Conf cool-bar (1.0 unstable [amd64])' aptget install cool-bar:amd64 -s
 

-       testequal 'Reading package lists...
+       testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following NEW packages will be installed:
   bar cool-bar
 Building dependency tree...
 The following NEW packages will be installed:
   bar cool-bar


@@ -139,7 +139,7 @@ Inst cool-bar (1.0 unstable [amd64])
 Conf bar (1.0 unstable [amd64])
 Conf cool-bar (1.0 unstable [amd64])' aptget install cool-bar:amd64 bar:amd64 -s
 
 Conf bar (1.0 unstable [amd64])
 Conf cool-bar (1.0 unstable [amd64])' aptget install cool-bar:amd64 bar:amd64 -s
 

-       testequal "Reading package lists...
+       testsuccessequal "Reading package lists...

 Building dependency tree...
 Note, selecting 'bar' instead of 'bar-provider'
 The following NEW packages will be installed:
 Building dependency tree...
 Note, selecting 'bar' instead of 'bar-provider'
 The following NEW packages will be installed:


@@ -150,7 +150,7 @@ 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 bar (1.0 unstable [amd64])
 Conf cool-bar (1.0 unstable [amd64])" aptget install cool-bar bar-provider -s -q=0
 

-       testequal 'Reading package lists...
+       testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following extra packages will be installed:
   foo
 Building dependency tree...
 The following extra packages will be installed:
   foo


@@ -164,7 +164,7 @@ Conf cool-foo-x64 (1.0 unstable [amd64])' aptget install cool-foo-x64 -s
 }
 
 #FIXME: do not work in single-arch as i386 isn't known at cache generation time
 }
 
 #FIXME: do not work in single-arch as i386 isn't known at cache generation time

-       testequal 'Reading package lists...
+       testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following extra packages will be installed:
   foo
 Building dependency tree...
 The following extra packages will be installed:
   foo


@@ -176,7 +176,7 @@ Inst cool-foo-x32 (1.0 unstable [amd64])
 Conf foo (1.0 unstable [amd64])
 Conf cool-foo-x32 (1.0 unstable [amd64])' aptget install cool-foo-x32 -s
 
 Conf foo (1.0 unstable [amd64])
 Conf cool-foo-x32 (1.0 unstable [amd64])' aptget install cool-foo-x32 -s
 

-       testequal 'Reading package lists...
+       testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following extra packages will be installed:
   bar
 Building dependency tree...
 The following extra packages will be installed:
   bar


@@ -188,7 +188,7 @@ 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 (1.0 unstable [amd64])
 Conf cool-bar-x32 (1.0 unstable [amd64])' aptget install cool-bar-x32 -s -q=0
 

-       testequal 'Reading package lists...
+       testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following extra packages will be installed:
   bar
 Building dependency tree...
 The following extra packages will be installed:
   bar