parse packages from all architectures into the cache

[apt.git] / test / integration / test-releasefile-verification

diff --git a/test/integration/test-releasefile-verification b/test/integration/test-releasefile-verification
index 1c3953c8b38302c5748471984689628fbc9f95b0..06701c62307f1addcd1bf6d6b4707af68037d78e 100755 (executable)
--- a/test/integration/test-releasefile-verification
+++ b/test/integration/test-releasefile-verification
@@ -36,7 +36,7 @@ installaptold() {
        testsuccessequal 'Reading package lists...
 Building dependency tree...
 Suggested packages:
        testsuccessequal 'Reading package lists...
 Building dependency tree...
 Suggested packages:

-  aptitude synaptic wajig dpkg-dev apt-doc bzip2 lzma python-apt
+  aptitude | synaptic | wajig dpkg-dev apt-doc bzip2 lzma python-apt

 The following NEW packages will be installed:
   apt
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 The following NEW packages will be installed:
   apt
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.


@@ -49,7 +49,7 @@ installaptnew() {
        testsuccessequal 'Reading package lists...
 Building dependency tree...
 Suggested packages:
        testsuccessequal 'Reading package lists...
 Building dependency tree...
 Suggested packages:

-  aptitude synaptic wajig dpkg-dev apt-doc bzip2 lzma python-apt
+  aptitude | synaptic | wajig dpkg-dev apt-doc bzip2 lzma python-apt

 The following NEW packages will be installed:
   apt
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 The following NEW packages will be installed:
   apt
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.


@@ -62,7 +62,7 @@ failaptold() {
        testfailureequal 'Reading package lists...
 Building dependency tree...
 Suggested packages:
        testfailureequal 'Reading package lists...
 Building dependency tree...
 Suggested packages:

-  aptitude synaptic wajig dpkg-dev apt-doc bzip2 lzma python-apt
+  aptitude | synaptic | wajig dpkg-dev apt-doc bzip2 lzma python-apt

 The following NEW packages will be installed:
   apt
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 The following NEW packages will be installed:
   apt
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.


@@ -76,7 +76,7 @@ failaptnew() {
        testfailureequal 'Reading package lists...
 Building dependency tree...
 Suggested packages:
        testfailureequal 'Reading package lists...
 Building dependency tree...
 Suggested packages:

-  aptitude synaptic wajig dpkg-dev apt-doc bzip2 lzma python-apt
+  aptitude | synaptic | wajig dpkg-dev apt-doc bzip2 lzma python-apt

 The following NEW packages will be installed:
   apt
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 The following NEW packages will be installed:
   apt
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.


@@ -92,7 +92,7 @@ touch aptarchive/apt.deb
 PKGFILE="${TESTDIR}/$(echo "$(basename $0)" | sed 's#^test-#Packages-#')"
 
 updatewithwarnings() {
 PKGFILE="${TESTDIR}/$(echo "$(basename $0)" | sed 's#^test-#Packages-#')"
 
 updatewithwarnings() {

-       testwarning aptget update
+       testwarning aptget update -o Debug::pkgAcquire::Worker=1 -o Debug::Acquire::gpgv=1

        testsuccess grep -E "$1" rootdir/tmp/testwarning.output
 }
 
        testsuccess grep -E "$1" rootdir/tmp/testwarning.output
 }
 


@@ -225,7 +225,7 @@ runtest() {
        signreleasefiles 'Joe Sixpack'
        find aptarchive/ -name "$DELETEFILE" -delete
        msgmsg 'Cold archive signed by bad keyid' 'Joe Sixpack'
        signreleasefiles 'Joe Sixpack'
        find aptarchive/ -name "$DELETEFILE" -delete
        msgmsg 'Cold archive signed by bad keyid' 'Joe Sixpack'

-       updatewithwarnings '^W: .* NO_PUBKEY'
+       updatewithwarnings '^W: .* be verified because the public key is not available: .*'

 
        sed -i "s#^\(deb\(-src\)\?\) \[signed-by=$MARVIN\] #\1 #" rootdir/etc/apt/sources.list.d/*
 }
 
        sed -i "s#^\(deb\(-src\)\?\) \[signed-by=$MARVIN\] #\1 #" rootdir/etc/apt/sources.list.d/*
 }