Merge remote-tracking branch 'origin/bugfix/dpkg-progress-multiarch' into bugfix...

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

diff --git a/test/integration/test-releasefile-verification b/test/integration/test-releasefile-verification
index 4f65cfa3b384472d3142508d9bdbb6834abd69a4..a9f4b977523d0ba3be51e5b56899e3ccdd547ece 100755 (executable)
--- a/test/integration/test-releasefile-verification
+++ b/test/integration/test-releasefile-verification
@@ -22,9 +22,7 @@ prepare() {
        aptget clean
        cp $1 aptarchive/Packages
        find aptarchive -name 'Release' -delete
-       cat aptarchive/Packages | gzip > aptarchive/Packages.gz
-       cat aptarchive/Packages | bzip2 > aptarchive/Packages.bz2
-       cat aptarchive/Packages | lzma > aptarchive/Packages.lzma
+       compressfile 'aptarchive/Packages'
        generatereleasefiles "$DATE"
 }
 
@@ -37,7 +35,7 @@ The following NEW packages will be installed:
   apt
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 After this operation, 5370 kB of additional disk space will be used.
-Get:1 http://localhost/  apt 0.7.25.3
+Get:1 http://localhost:8080/  apt 0.7.25.3
 Download complete and in download only mode' aptget install apt -dy
 }
 
@@ -50,7 +48,7 @@ The following NEW packages will be installed:
   apt
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 After this operation, 5808 kB of additional disk space will be used.
-Get:1 http://localhost/  apt 0.8.0~pre1
+Get:1 http://localhost:8080/  apt 0.8.0~pre1
 Download complete and in download only mode' aptget install apt -dy
 }
 
@@ -107,13 +105,24 @@ runtest() {
 " aptcache show apt
        installaptnew
 
+       prepare ${PKGFILE}
+       rm -rf rootdir/var/lib/apt/lists
+       cp keys/rexexpired.pub rootdir/etc/apt/trusted.gpg.d/rexexpired.gpg
+       signreleasefiles 'Rex Expired'
+       find aptarchive/ -name "$DELETEFILE" -delete
+       msgtest 'Cold archive signed by' 'Rex Expired'
+       aptget update 2>&1 | grep -E '^W: .* KEYEXPIRED' > /dev/null && msgpass || msgfail
+       testequal "$(cat ${PKGFILE})
+" aptcache show apt
+       failaptold
+       rm rootdir/etc/apt/trusted.gpg.d/rexexpired.gpg
 
        prepare ${PKGFILE}
        rm -rf rootdir/var/lib/apt/lists
        signreleasefiles 'Marvin Paranoid'
        find aptarchive/ -name "$DELETEFILE" -delete
        msgtest 'Cold archive signed by' 'Marvin Paranoid'
-       aptget update 2>&1 | grep -E '^(W|E): ' > /dev/null && msgpass || msgfail
+       aptget update 2>&1 | grep -E '^W: .* NO_PUBKEY' > /dev/null && msgpass || msgfail
        testequal "$(cat ${PKGFILE})
 " aptcache show apt
        failaptold
@@ -147,10 +156,30 @@ runtest() {
        signreleasefiles 'Marvin Paranoid'
        find aptarchive/ -name "$DELETEFILE" -delete
        msgtest 'Good warm archive signed by' 'Marvin Paranoid'
-       aptget update 2>&1 | grep -E '^(W|E): ' > /dev/null && msgpass || msgfail
+       aptget update 2>&1 | grep -E '^W: .* NO_PUBKEY' > /dev/null && msgpass || msgfail
+       testequal "$(cat ${PKGFILE})
+" aptcache show apt
+       installaptold
+
+       prepare ${PKGFILE}-new
+       cp keys/rexexpired.pub rootdir/etc/apt/trusted.gpg.d/rexexpired.gpg
+       signreleasefiles 'Rex Expired'
+       find aptarchive/ -name "$DELETEFILE" -delete
+       msgtest 'Good warm archive signed by' 'Rex Expired'
+       aptget update 2>&1 | grep -E '^W: .* KEYEXPIRED' > /dev/null && msgpass || msgfail
        testequal "$(cat ${PKGFILE})
 " aptcache show apt
        installaptold
+       rm rootdir/etc/apt/trusted.gpg.d/rexexpired.gpg
+
+       prepare ${PKGFILE}-new
+       signreleasefiles
+       find aptarchive/ -name "$DELETEFILE" -delete
+       msgtest 'Good warm archive signed by' 'Joe Sixpack'
+       aptget update 2>&1 | grep -E '^(W|E): ' > /dev/null && msgfail || msgpass
+       testequal "$(cat ${PKGFILE}-new)
+" aptcache show apt
+       installaptnew
 }
 
 runtest2() {