acquire: Use priority queues and a 3 stage pipeline design

[apt.git] / test / integration / test-bug-595691-empty-and-broken-archive-files

diff --git a/test/integration/test-bug-595691-empty-and-broken-archive-files b/test/integration/test-bug-595691-empty-and-broken-archive-files
index 66792899a834e4c1b3ee5aa5ade5efbfd985dd4f..d71bd2ce5a875840973fb4d6d9e98662c14ebad0 100755 (executable)
--- a/test/integration/test-bug-595691-empty-and-broken-archive-files
+++ b/test/integration/test-bug-595691-empty-and-broken-archive-files
@@ -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 "i386"
 
 setupenvironment
 configarchitecture "i386"
 


@@ -10,140 +10,55 @@ buildaptarchive
 touch aptarchive/Packages
 setupflataptarchive
 
 touch aptarchive/Packages
 setupflataptarchive
 

-testaptgetupdate() {
-       rm -rf rootdir/var/lib/apt rootdir/var/cache/apt
-       aptget update 2>> testaptgetupdate.diff >> testaptgetupdate.diff || true
-       sed -i -e '/^Fetched / d' -e 's#\[[0-9]* [kMGTPY]*B\]#\[\]#' testaptgetupdate.diff
-       GIVEN="$1"
-       shift
-       msgtest "Test for correctness of" "apt-get update with $*"
-       if [ -z "$GIVEN" ]; then
-               echo -n "" | checkdiff - testaptgetupdate.diff && msgpass || msgfail
-       else
-               echo "$GIVEN" | checkdiff - testaptgetupdate.diff && msgpass || msgfail
-       fi
-       rm testaptgetupdate.diff
+failureupdate() {
+       rm -rf rootdir/var/lib/apt
+       testfailure aptget update --allow-insecure-repositories
+       testsuccess grep "^E: Failed to fetch store:${1}  Empty files can't be valid archives$" rootdir/tmp/testfailure.output
+}
+successupdate() {
+       rm -rf rootdir/var/lib/apt
+       testwarning aptget update --allow-insecure-repositories

 }
 
 createemptyarchive() {
        find aptarchive/ \( -name "Packages*" -o -name "en*" \) -type f -delete
 }
 
 createemptyarchive() {
        find aptarchive/ \( -name "Packages*" -o -name "en*" \) -type f -delete

-       if [ "en" = "$1" ]; then
-               echo -n "" | $COMPRESSOR > aptarchive/Packages.$COMPRESS
-       fi

        touch aptarchive/Packages
        touch aptarchive/Packages

-       echo -n "" | $COMPRESSOR > aptarchive/${1}.$COMPRESS
-       aptftparchive release aptarchive/ > aptarchive/Release
-       signreleasefiles
+       echo -n "" | $COMPRESSOR_CMD > aptarchive/${1}.$COMPRESS
+       find aptarchive -name '*Release*' -delete

        rm -f aptarchive/Packages
 }
 
 createemptyfile() {
        find aptarchive/ \( -name "Packages*" -o -name "en*" \) -type f -delete
        rm -f aptarchive/Packages
 }
 
 createemptyfile() {
        find aptarchive/ \( -name "Packages*" -o -name "en*" \) -type f -delete

-       if [ "en" = "$1" ]; then
-               echo -n "" | $COMPRESSOR > aptarchive/Packages.$COMPRESS
-       fi

        touch aptarchive/Packages aptarchive/${1}.$COMPRESS
        touch aptarchive/Packages aptarchive/${1}.$COMPRESS

-       aptftparchive release aptarchive/ > aptarchive/Release
-       signreleasefiles
+       find aptarchive -name '*Release*' -delete

        rm -f aptarchive/Packages
 }
 
        rm -f aptarchive/Packages
 }
 

-setupcompressor() {
-       COMPRESSOR="$1"
-       case $COMPRESSOR in
-       gzip) COMPRESS="gz";;
-       bzip2) COMPRESS="bz2";;
-       lzma) COMPRESS="lzma";;
-       esac
-       echo "Acquire::CompressionTypes::Order { \"${COMPRESS}\"; };
-Dir::Bin::gzip \"/does/not/exist\";
-Dir::Bin::bzip2 \"/does/not/exist\";
-Dir::Bin::lzma \"/does/not/exist\";" > rootdir/etc/apt/apt.conf.d/00compressor
-       if [ -e "/bin/${COMPRESSOR}" ]; then
-               echo "Dir::Bin::${COMPRESSOR} \"/bin/${COMPRESSOR}\";" >> rootdir/etc/apt/apt.conf.d/00compressor
-       elif [ -e "/usr/bin/${COMPRESSOR}" ]; then
-               echo "Dir::Bin::${COMPRESSOR} \"/usr/bin/${COMPRESSOR}\";" >> rootdir/etc/apt/apt.conf.d/00compressor
-       else
-               msgtest "Test for availability of compressor" "${COMPRESSOR}"
-               msgfail
-               exit 1
-       fi
-}
-

 testoverfile() {
 testoverfile() {

-       setupcompressor "$1"
-
-       createemptyfile 'en'
-       testaptgetupdate "Get:1 file:  Release.gpg []
-Get:2 file:  Release []
-Ign file:$(readlink -f aptarchive)/  Translation-en
-Reading package lists..." "empty file en.$COMPRESS over file"
-
-       createemptyarchive 'en'
-       testaptgetupdate "Get:1 file:  Release.gpg []
-Get:2 file:  Release []
-Reading package lists..." "empty archive en.$COMPRESS over file"
+       local APTARCHIVE="$(readlink -f ./aptarchive)"
+       forcecompressor "$1"

 
 

+       msgmsg 'archive over file' "Packages.$COMPRESS"

        createemptyarchive 'Packages'
        createemptyarchive 'Packages'

-       # FIXME: Why omits the file transport the Packages Get line?
-       #Get:3 file:  Packages []
-       testaptgetupdate "Ign file:$(readlink -f aptarchive)/  Translation-en
-Get:1 file:  Release.gpg []
-Get:2 file:  Release []
-Reading package lists..." "empty archive Packages.$COMPRESS over file"
-
+       successupdate

        createemptyfile 'Packages'
        createemptyfile 'Packages'

-       testaptgetupdate "Ign file:$(readlink -f aptarchive)/  Translation-en
-Get:1 file:  Release.gpg []
-Get:2 file:  Release []
-Err file:  Packages
-  Undetermined Error
-W: Failed to fetch file:$(readlink -f aptarchive/Packages.$COMPRESS)  Undetermined Error
-
-E: Some index files failed to download, they have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over file"
+       failureupdate "$(readlink -f rootdir/var/lib/apt/lists/partial/$(echo "$APTARCHIVE" | sed -e 's#/#_#g')_Packages.${COMPRESS})"

 }
 
 testoverhttp() {
 }
 
 testoverhttp() {

-       setupcompressor "$1"
-
-       createemptyfile 'en'
-       testaptgetupdate "Get:1 http://localhost  Release.gpg []
-Get:2 http://localhost/  Translation-en
-Get:3 http://localhost  Release []
-Ign http://localhost/  Translation-en
-Get:4 http://localhost  Packages []
-Reading package lists..." "empty file en.$COMPRESS over http"
-
-       createemptyarchive 'en'
-       testaptgetupdate "Get:1 http://localhost  Release.gpg []
-Get:2 http://localhost/  Translation-en []
-Get:3 http://localhost  Release []
-Get:4 http://localhost  Packages []
-Reading package lists..." "empty archive en.$COMPRESS over http"
+       forcecompressor "$1"

 
 

+       msgmsg 'archive over http' "Packages.$COMPRESS"

        createemptyarchive 'Packages'
        createemptyarchive 'Packages'

-       testaptgetupdate "Get:1 http://localhost  Release.gpg []
-Ign http://localhost/  Translation-en
-Get:2 http://localhost  Release []
-Get:3 http://localhost  Packages []
-Reading package lists..." "empty archive Packages.$COMPRESS over http"
-
+       successupdate

        createemptyfile 'Packages'
        createemptyfile 'Packages'

-       #FIXME: we should response with a good error message instead
-       testaptgetupdate "Get:1 http://localhost  Release.gpg []
-Ign http://localhost/  Translation-en
-Get:2 http://localhost  Release []
-Get:3 http://localhost  Packages
-Err http://localhost  Packages
-  Undetermined Error
-W: Failed to fetch http://localhost:8080/Packages.$COMPRESS  Undetermined Error
-
-E: Some index files failed to download, they have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over http"
+       failureupdate "$(readlink -f rootdir/var/lib/apt/lists/partial/localhost:${APTHTTPPORT}_Packages.${COMPRESS})"

 }
 
 }
 

-for COMPRESSOR in 'gzip' 'bzip2' 'lzma'; do testoverfile $COMPRESSOR; done
+forallsupportedcompressors testoverfile

 
 # do the same again with http instead of file
 changetowebserver
 
 
 # do the same again with http instead of file
 changetowebserver
 

-for COMPRESSOR in 'gzip' 'bzip2' 'lzma'; do testoverhttp $COMPRESSOR; done
+forallsupportedcompressors testoverhttp