improve CheckDropPrivsMustBeDisabled further

[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 63883b38072e6864aa00749d00152cc64550d182..0c02aee30e0ba1512215644b7f60f5e9e6546a43 100755 (executable)
--- a/test/integration/test-bug-595691-empty-and-broken-archive-files
+++ b/test/integration/test-bug-595691-empty-and-broken-archive-files
@@ -12,8 +12,8 @@ setupflataptarchive
 
 testaptgetupdate() {
        rm -rf rootdir/var/lib/apt
-       aptget update 2>> testaptgetupdate.diff >> testaptgetupdate.diff || true
-       sed -i -e '/^Fetched / d' -e '/Ign / d' -e 's#\[[0-9]* [kMGTPY]*B\]#\[\]#' testaptgetupdate.diff
+       aptget update >testaptgetupdate.diff 2>&1 || true
+       sed -i -e '/Ign /,+1d' -e '/Release/ d' -e 's#\[[0-9]* [kMGTPY]*B\]#\[\]#' testaptgetupdate.diff
        GIVEN="$1"
        shift
        msgtest "Test for correctness of" "apt-get update with $*"
@@ -27,9 +27,6 @@ testaptgetupdate() {
 
 createemptyarchive() {
        find aptarchive/ \( -name "Packages*" -o -name "en*" \) -type f -delete
-       if [ "en" = "$1" ]; then
-               echo -n "" | $COMPRESSOR_CMD > aptarchive/Packages.$COMPRESS
-       fi
        touch aptarchive/Packages
        echo -n "" | $COMPRESSOR_CMD > aptarchive/${1}.$COMPRESS
        generatereleasefiles
@@ -39,98 +36,41 @@ createemptyarchive() {
 
 createemptyfile() {
        find aptarchive/ \( -name "Packages*" -o -name "en*" \) -type f -delete
-       if [ "en" = "$1" ]; then
-               echo -n "" | $COMPRESSOR_CMD > aptarchive/Packages.$COMPRESS
-       fi
        touch aptarchive/Packages aptarchive/${1}.$COMPRESS
        generatereleasefiles
        signreleasefiles
        rm -f aptarchive/Packages
 }
 
-setupcompressor() {
-       COMPRESSOR="$1"
-       COMPRESSOR_CMD="$1"
-       case $COMPRESSOR in
-       gzip) COMPRESS="gz";;
-       bzip2) COMPRESS="bz2";;
-       lzma) COMPRESS="lzma";;
-       xz) COMPRESS="xz";;
-       esac
-       echo "Acquire::CompressionTypes::Order { \"${COMPRESS}\"; };
-Dir::Bin::uncompressed \"/does/not/exist\";
-Dir::Bin::gzip \"/does/not/exist\";
-Dir::Bin::bzip2 \"/does/not/exist\";
-Dir::Bin::lzma \"/does/not/exist\";
-Dir::Bin::xz \"/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
-       elif [ "${COMPRESSOR}" = 'lzma' ]; then
-               echo "Dir::Bin::xz \"/usr/bin/xz\";" >> rootdir/etc/apt/apt.conf.d/00compressor
-               COMPRESSOR_CMD='xz --format=lzma'
-       else
-               msgtest "Test for availability of compressor" "${COMPRESSOR}"
-               msgfail
-               #exit 1
-       fi
-}
-
 testoverfile() {
-       setupcompressor "$1"
-
-       createemptyfile 'en'
-       testaptgetupdate "Get:1 file:  InRelease []
-Reading package lists..." "empty file en.$COMPRESS over file"
-
-       createemptyarchive 'en'
-       testaptgetupdate "Get:1 file:  InRelease []
-Reading package lists..." "empty archive en.$COMPRESS over file"
+       local APTARCHIVE="$(readlink -f ./aptarchive)"
+       forcecompressor "$1"
 
        createemptyarchive 'Packages'
-       # FIXME: Why omits the file transport the Packages Get line?
-       #Get:3 file:  Packages []
-       testaptgetupdate "Get:1 file:  InRelease []
+       testaptgetupdate "Get:2 file:$APTARCHIVE  Packages []
 Reading package lists..." "empty archive Packages.$COMPRESS over file"
 
        createemptyfile 'Packages'
-       testaptgetupdate "Get:1 file:  InRelease []
-Err file:  Packages
+       testaptgetupdate "Get:2 file:$APTARCHIVE  Packages
+Err:2 file:$APTARCHIVE  Packages
   Empty files can't be valid archives
-W: Failed to fetch ${COMPRESSOR}:$(readlink -f aptarchive/Packages.$COMPRESS)  Empty files can't be valid archives
-
+W: Failed to fetch ${COMPRESSOR}:${APTARCHIVE}/Packages.$COMPRESS  Empty files can't be valid archives
 E: Some index files failed to download. They have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over file"
 }
 
 testoverhttp() {
-       setupcompressor "$1"
-
-       createemptyfile 'en'
-       testaptgetupdate "Get:1 http://localhost  InRelease []
-Get:2 http://localhost  Packages []
-Get:3 http://localhost  Translation-en
-Reading package lists..." "empty file en.$COMPRESS over http"
-
-       createemptyarchive 'en'
-       testaptgetupdate "Get:1 http://localhost  InRelease []
-Get:2 http://localhost  Packages []
-Get:3 http://localhost  Translation-en []
-Reading package lists..." "empty archive en.$COMPRESS over http"
+       forcecompressor "$1"
 
        createemptyarchive 'Packages'
-       testaptgetupdate "Get:1 http://localhost  InRelease []
-Get:2 http://localhost  Packages []
+       testaptgetupdate "Get:2 http://localhost:8080  Packages []
 Reading package lists..." "empty archive Packages.$COMPRESS over http"
 
        createemptyfile 'Packages'
        #FIXME: we should response with a good error message instead
-       testaptgetupdate "Get:1 http://localhost  InRelease []
-Get:2 http://localhost  Packages
-Err http://localhost  Packages
+       testaptgetupdate "Get:2 http://localhost:8080  Packages
+Err:2 http://localhost:8080  Packages
   Empty files can't be valid archives
-W: Failed to fetch ${COMPRESSOR}:$(readlink -f rootdir/var/lib/apt/lists/partial/localhost:8080_Packages)  Empty files can't be valid archives
-
+W: Failed to fetch ${COMPRESSOR}:$(readlink -f rootdir/var/lib/apt/lists/partial/localhost:8080_Packages.${COMPRESS})  Empty files can't be valid archives
 E: Some index files failed to download. They have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over http"
 }