add apt-key support for armored GPG key files (*.asc)

[apt.git] / test / integration / test-apt-update-ims

diff --git a/test/integration/test-apt-update-ims b/test/integration/test-apt-update-ims
index 623c3d380f69fdda3fd168f8d563313bdb21e24f..1894c3adfeafb8c15c0e27c1a859f658943de115 100755 (executable)
--- a/test/integration/test-apt-update-ims
+++ b/test/integration/test-apt-update-ims
@@ -1,15 +1,18 @@
 #!/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'
 
 insertpackage 'unstable' 'unrelated' 'all' '0.5~squeeze1'
 setupenvironment
 configarchitecture 'amd64'
 
 insertpackage 'unstable' 'unrelated' 'all' '0.5~squeeze1'

+insertpackage 'unstable' 'unrelated2' 'amd64' '0.5~squeeze1'

 insertsource 'unstable' 'unrelated' 'all' '0.5~squeeze1'
 
 insertsource 'unstable' 'unrelated' 'all' '0.5~squeeze1'
 

+export APT_DONT_SIGN=""

 setupaptarchive --no-update
 setupaptarchive --no-update

+logcurrentarchivedirectory

 changetowebserver
 
 runtest() {
 changetowebserver
 
 runtest() {


@@ -23,22 +26,22 @@ runtest() {
     rm -rf rootdir/var/lib/apt/lists/
 
     local TEST="test${1:-success}"
     rm -rf rootdir/var/lib/apt/lists/
 
     local TEST="test${1:-success}"

-    $TEST aptget update $APTOPT
+    $TEST aptget update $APTOPT -o Debug::pkgAcquire::Worker=1

     if [ "$1" = 'failure' ]; then
        # accept the outdated Release file so we can check Hit behaviour
        "test${2:-success}" aptget update -o Acquire::Min-ValidTime=9999999 $APTOPT
     fi
     listcurrentlistsdirectory > listsdir.lst
     if [ "$1" = 'failure' ]; then
        # accept the outdated Release file so we can check Hit behaviour
        "test${2:-success}" aptget update -o Acquire::Min-ValidTime=9999999 $APTOPT
     fi
     listcurrentlistsdirectory > listsdir.lst

-    testsuccess grep '_Packages\(\.gz\)\?$' listsdir.lst
-    testsuccess grep '_Sources\(\.gz\)\?$' listsdir.lst
-    testsuccess grep '_Translation-en\(\.gz\)\?$' listsdir.lst
+    testsuccess grep '_Packages\(\.[0-9a-z]\+\)\?$' listsdir.lst
+    testsuccess grep '_Sources\(\.[0-9a-z]\+\)\?$' listsdir.lst
+    testsuccess grep '_Translation-en\(\.[0-9a-z]\+\)\?$' listsdir.lst

 
     # ensure no leftovers in partial
     testfailure ls 'rootdir/var/lib/apt/lists/partial/*'
 
     # check that I-M-S header is kept in redirections
     echo "$EXPECT" | sed -e 's#(invalid since [^)]\+)#(invalid since)#' > expected.output
 
     # ensure no leftovers in partial
     testfailure ls 'rootdir/var/lib/apt/lists/partial/*'
 
     # check that I-M-S header is kept in redirections
     echo "$EXPECT" | sed -e 's#(invalid since [^)]\+)#(invalid since)#' > expected.output

-    $TEST aptget update  -o Debug::pkgAcquire::Worker=0 -o Debug::Acquire::http=0 -q=0 $APTOPT
+    $TEST aptget update  -o Debug::pkgAcquire::Worker=0 -o Debug::Acquire::http=0 $APTOPT

     sed -i -e 's#(invalid since [^)]\+)#(invalid since)#' rootdir/tmp/${TEST}.output
     testequal "$(cat expected.output)" cat rootdir/tmp/${TEST}.output
     testfileequal 'listsdir.lst' "$(listcurrentlistsdirectory)"
     sed -i -e 's#(invalid since [^)]\+)#(invalid since)#' rootdir/tmp/${TEST}.output
     testequal "$(cat expected.output)" cat rootdir/tmp/${TEST}.output
     testfileequal 'listsdir.lst' "$(listcurrentlistsdirectory)"


@@ -48,7 +51,7 @@ runtest() {
            $TEST aptget update -o Debug::Acquire::gpgv=1 $APTOPT
            cp rootdir/tmp/${TEST}.output goodsign.output
            testfileequal 'listsdir.lst' "$(listcurrentlistsdirectory)"
            $TEST aptget update -o Debug::Acquire::gpgv=1 $APTOPT
            cp rootdir/tmp/${TEST}.output goodsign.output
            testfileequal 'listsdir.lst' "$(listcurrentlistsdirectory)"

-           testsuccess grep '^Got GOODSIG, key ID:GOODSIG' goodsign.output
+           testsuccess grep '^Got GOODSIG ' goodsign.output

     fi
 
     # ensure no leftovers in partial
     fi
 
     # ensure no leftovers in partial


@@ -69,6 +72,7 @@ EXPECT="Ign:1 http://localhost:${APTHTTPPORT} unstable InRelease
 Hit:2 http://localhost:${APTHTTPPORT} unstable Release
 Reading package lists..."
 find aptarchive -name 'InRelease' -delete
 Hit:2 http://localhost:${APTHTTPPORT} unstable Release
 Reading package lists..."
 find aptarchive -name 'InRelease' -delete

+logcurrentarchivedirectory

 echo 'Acquire::GzipIndexes "0";' > rootdir/etc/apt/apt.conf.d/02compressindex
 runtest
 echo 'Acquire::GzipIndexes "1";' > rootdir/etc/apt/apt.conf.d/02compressindex
 echo 'Acquire::GzipIndexes "0";' > rootdir/etc/apt/apt.conf.d/02compressindex
 runtest
 echo 'Acquire::GzipIndexes "1";' > rootdir/etc/apt/apt.conf.d/02compressindex


@@ -82,9 +86,10 @@ Ign:3 http://localhost:${APTHTTPPORT} unstable Release.gpg
   404  Not Found
 Reading package lists...
 W: The repository 'http://localhost:${APTHTTPPORT} unstable Release' is not signed.
   404  Not Found
 Reading package lists...
 W: The repository 'http://localhost:${APTHTTPPORT} unstable Release' is not signed.

-N: Data from such a repository can not be authenticated and is therefore potentially dangerous to use.
+N: Data from such a repository can't be authenticated and is therefore potentially dangerous to use.

 N: See apt-secure(8) manpage for repository creation and user configuration details."
 find aptarchive -name 'Release.gpg' -delete
 N: See apt-secure(8) manpage for repository creation and user configuration details."
 find aptarchive -name 'Release.gpg' -delete

+logcurrentarchivedirectory

 echo 'Acquire::GzipIndexes "0";' > rootdir/etc/apt/apt.conf.d/02compressindex
 runtest 'warning'
 echo 'Acquire::GzipIndexes "1";' > rootdir/etc/apt/apt.conf.d/02compressindex
 echo 'Acquire::GzipIndexes "0";' > rootdir/etc/apt/apt.conf.d/02compressindex
 runtest 'warning'
 echo 'Acquire::GzipIndexes "1";' > rootdir/etc/apt/apt.conf.d/02compressindex


@@ -93,10 +98,11 @@ runtest 'warning'
 
 # make the release file old
 find aptarchive -name '*Release' -exec sed -i \
 
 # make the release file old
 find aptarchive -name '*Release' -exec sed -i \

-       -e "s#^Date: .*\$#Date: $(date -d '-2 weeks' '+%a, %d %b %Y %H:%M:%S %Z')#" \
+       -e "s#^Date: .*\$#Date: $(date -ud '-2 weeks' '+%a, %d %b %Y %H:%M:%S %Z')#" \

        -e '/^Valid-Until: / d' -e "/^Date: / a\
        -e '/^Valid-Until: / d' -e "/^Date: / a\

-Valid-Until: $(date -d '-1 weeks' '+%a, %d %b %Y %H:%M:%S %Z')" '{}' \;
+Valid-Until: $(date -ud '-1 weeks' '+%a, %d %b %Y %H:%M:%S %Z')" '{}' \;

 signreleasefiles
 signreleasefiles

+logcurrentarchivedirectory

 
 msgmsg 'expired InRelease'
 EXPECT="Hit:1 http://localhost:${APTHTTPPORT} unstable InRelease
 
 msgmsg 'expired InRelease'
 EXPECT="Hit:1 http://localhost:${APTHTTPPORT} unstable InRelease


@@ -114,6 +120,7 @@ Hit:2 http://localhost:${APTHTTPPORT} unstable Release
 Reading package lists...
 E: Release file for http://localhost:${APTHTTPPORT}/dists/unstable/Release is expired (invalid since). Updates for this repository will not be applied."
 find aptarchive -name 'InRelease' -delete
 Reading package lists...
 E: Release file for http://localhost:${APTHTTPPORT}/dists/unstable/Release is expired (invalid since). Updates for this repository will not be applied."
 find aptarchive -name 'InRelease' -delete

+logcurrentarchivedirectory

 echo 'Acquire::GzipIndexes "0";' > rootdir/etc/apt/apt.conf.d/02compressindex
 runtest 'failure'
 echo 'Acquire::GzipIndexes "1";' > rootdir/etc/apt/apt.conf.d/02compressindex
 echo 'Acquire::GzipIndexes "0";' > rootdir/etc/apt/apt.conf.d/02compressindex
 runtest 'failure'
 echo 'Acquire::GzipIndexes "1";' > rootdir/etc/apt/apt.conf.d/02compressindex


@@ -127,10 +134,11 @@ Ign:3 http://localhost:${APTHTTPPORT} unstable Release.gpg
   404  Not Found
 Reading package lists...
 W: The repository 'http://localhost:${APTHTTPPORT} unstable Release' is not signed.
   404  Not Found
 Reading package lists...
 W: The repository 'http://localhost:${APTHTTPPORT} unstable Release' is not signed.

-N: Data from such a repository can not be authenticated and is therefore potentially dangerous to use.
+N: Data from such a repository can't be authenticated and is therefore potentially dangerous to use.

 N: See apt-secure(8) manpage for repository creation and user configuration details.
 E: Release file for http://localhost:${APTHTTPPORT}/dists/unstable/Release is expired (invalid since). Updates for this repository will not be applied."
 find aptarchive -name 'Release.gpg' -delete
 N: See apt-secure(8) manpage for repository creation and user configuration details.
 E: Release file for http://localhost:${APTHTTPPORT}/dists/unstable/Release is expired (invalid since). Updates for this repository will not be applied."
 find aptarchive -name 'Release.gpg' -delete

+logcurrentarchivedirectory

 echo 'Acquire::GzipIndexes "0";' > rootdir/etc/apt/apt.conf.d/02compressindex
 runtest 'failure' 'warning'
 echo 'Acquire::GzipIndexes "1";' > rootdir/etc/apt/apt.conf.d/02compressindex
 echo 'Acquire::GzipIndexes "0";' > rootdir/etc/apt/apt.conf.d/02compressindex
 runtest 'failure' 'warning'
 echo 'Acquire::GzipIndexes "1";' > rootdir/etc/apt/apt.conf.d/02compressindex


@@ -146,28 +154,36 @@ Ign:3 http://localhost:${APTHTTPPORT} unstable/main Sources
   404  Not Found
 Ign:4 http://localhost:${APTHTTPPORT} unstable/main amd64 Packages
   404  Not Found
   404  Not Found
 Ign:4 http://localhost:${APTHTTPPORT} unstable/main amd64 Packages
   404  Not Found

-Ign:5 http://localhost:${APTHTTPPORT} unstable/main Translation-en
+Ign:5 http://localhost:${APTHTTPPORT} unstable/main all Packages
+  404  Not Found
+Ign:6 http://localhost:${APTHTTPPORT} unstable/main Translation-en

   404  Not Found
 Ign:3 http://localhost:${APTHTTPPORT} unstable/main Sources
   404  Not Found
 Ign:4 http://localhost:${APTHTTPPORT} unstable/main amd64 Packages
   404  Not Found
   404  Not Found
 Ign:3 http://localhost:${APTHTTPPORT} unstable/main Sources
   404  Not Found
 Ign:4 http://localhost:${APTHTTPPORT} unstable/main amd64 Packages
   404  Not Found

-Ign:5 http://localhost:${APTHTTPPORT} unstable/main Translation-en
+Ign:5 http://localhost:${APTHTTPPORT} unstable/main all Packages
+  404  Not Found
+Ign:6 http://localhost:${APTHTTPPORT} unstable/main Translation-en

   404  Not Found
 Ign:3 http://localhost:${APTHTTPPORT} unstable/main Sources
   404  Not Found
 Ign:4 http://localhost:${APTHTTPPORT} unstable/main amd64 Packages
   404  Not Found
   404  Not Found
 Ign:3 http://localhost:${APTHTTPPORT} unstable/main Sources
   404  Not Found
 Ign:4 http://localhost:${APTHTTPPORT} unstable/main amd64 Packages
   404  Not Found

-Ign:5 http://localhost:${APTHTTPPORT} unstable/main Translation-en
+Ign:5 http://localhost:${APTHTTPPORT} unstable/main all Packages
+  404  Not Found
+Ign:6 http://localhost:${APTHTTPPORT} unstable/main Translation-en

   404  Not Found
 Hit:3 http://localhost:${APTHTTPPORT} unstable/main Sources
 Hit:4 http://localhost:${APTHTTPPORT} unstable/main amd64 Packages
   404  Not Found
 Hit:3 http://localhost:${APTHTTPPORT} unstable/main Sources
 Hit:4 http://localhost:${APTHTTPPORT} unstable/main amd64 Packages

-Hit:5 http://localhost:${APTHTTPPORT} unstable/main Translation-en
+Hit:5 http://localhost:${APTHTTPPORT} unstable/main all Packages
+Hit:6 http://localhost:${APTHTTPPORT} unstable/main Translation-en

 Reading package lists...
 W: The repository 'http://localhost:${APTHTTPPORT} unstable Release' does not have a Release file.
 Reading package lists...
 W: The repository 'http://localhost:${APTHTTPPORT} unstable Release' does not have a Release file.

-N: Data from such a repository can not be authenticated and is therefore potentially dangerous to use.
+N: Data from such a repository can't be authenticated and is therefore potentially dangerous to use.

 N: See apt-secure(8) manpage for repository creation and user configuration details."
 find aptarchive -name '*Release*' -delete
 N: See apt-secure(8) manpage for repository creation and user configuration details."
 find aptarchive -name '*Release*' -delete

+logcurrentarchivedirectory

 echo 'Acquire::GzipIndexes "0";
 Acquire::PDiffs "0";' > rootdir/etc/apt/apt.conf.d/02compressindex
 runtest 'warning'
 echo 'Acquire::GzipIndexes "0";
 Acquire::PDiffs "0";' > rootdir/etc/apt/apt.conf.d/02compressindex
 runtest 'warning'