always send content-length via the new addDataHeaders() to ensure w3m/curl are happy...

[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 684559aa7a05e1d9585a0d415632261240e80afe..63883b38072e6864aa00749d00152cc64550d182 100755 (executable)
--- a/test/integration/test-bug-595691-empty-and-broken-archive-files
+++ b/test/integration/test-bug-595691-empty-and-broken-archive-files
@@ -11,9 +11,9 @@ touch aptarchive/Packages
 setupflataptarchive
 
 testaptgetupdate() {
 setupflataptarchive
 
 testaptgetupdate() {

-       rm -rf rootdir/var/lib/apt rootdir/var/cache/apt
+       rm -rf rootdir/var/lib/apt

        aptget update 2>> testaptgetupdate.diff >> testaptgetupdate.diff || true
        aptget update 2>> testaptgetupdate.diff >> testaptgetupdate.diff || true

-       sed -i -e '/^Fetched / d' -e 's#\[[0-9]* [kMGTPY]*B\]#\[\]#' testaptgetupdate.diff
+       sed -i -e '/^Fetched / d' -e '/Ign / d' -e 's#\[[0-9]* [kMGTPY]*B\]#\[\]#' testaptgetupdate.diff

        GIVEN="$1"
        shift
        msgtest "Test for correctness of" "apt-get update with $*"
        GIVEN="$1"
        shift
        msgtest "Test for correctness of" "apt-get update with $*"


@@ -28,10 +28,10 @@ testaptgetupdate() {
 createemptyarchive() {
        find aptarchive/ \( -name "Packages*" -o -name "en*" \) -type f -delete
        if [ "en" = "$1" ]; then
 createemptyarchive() {
        find aptarchive/ \( -name "Packages*" -o -name "en*" \) -type f -delete
        if [ "en" = "$1" ]; then

-               echo -n "" | $COMPRESSOR > aptarchive/Packages.$COMPRESS
+               echo -n "" | $COMPRESSOR_CMD > aptarchive/Packages.$COMPRESS

        fi
        touch aptarchive/Packages
        fi
        touch aptarchive/Packages

-       echo -n "" | $COMPRESSOR > aptarchive/${1}.$COMPRESS
+       echo -n "" | $COMPRESSOR_CMD > aptarchive/${1}.$COMPRESS

        generatereleasefiles
        signreleasefiles
        rm -f aptarchive/Packages
        generatereleasefiles
        signreleasefiles
        rm -f aptarchive/Packages


@@ -40,7 +40,7 @@ createemptyarchive() {
 createemptyfile() {
        find aptarchive/ \( -name "Packages*" -o -name "en*" \) -type f -delete
        if [ "en" = "$1" ]; then
 createemptyfile() {
        find aptarchive/ \( -name "Packages*" -o -name "en*" \) -type f -delete
        if [ "en" = "$1" ]; then

-               echo -n "" | $COMPRESSOR > aptarchive/Packages.$COMPRESS
+               echo -n "" | $COMPRESSOR_CMD > aptarchive/Packages.$COMPRESS

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


@@ -50,24 +50,30 @@ createemptyfile() {
 
 setupcompressor() {
        COMPRESSOR="$1"
 
 setupcompressor() {
        COMPRESSOR="$1"

+       COMPRESSOR_CMD="$1"

        case $COMPRESSOR in
        gzip) COMPRESS="gz";;
        bzip2) COMPRESS="bz2";;
        lzma) COMPRESS="lzma";;
        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\";
        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\";" > rootdir/etc/apt/apt.conf.d/00compressor
+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
        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
        else
                msgtest "Test for availability of compressor" "${COMPRESSOR}"
                msgfail

-               exit 1
+               #exit 1

        fi
 }
 
        fi
 }
 


@@ -76,7 +82,6 @@ testoverfile() {
 
        createemptyfile 'en'
        testaptgetupdate "Get:1 file:  InRelease []
 
        createemptyfile 'en'
        testaptgetupdate "Get:1 file:  InRelease []

-Ign file:  Translation-en

 Reading package lists..." "empty file en.$COMPRESS over file"
 
        createemptyarchive 'en'
 Reading package lists..." "empty file en.$COMPRESS over file"
 
        createemptyarchive 'en'


@@ -87,17 +92,15 @@ Reading package lists..." "empty archive en.$COMPRESS over file"
        # FIXME: Why omits the file transport the Packages Get line?
        #Get:3 file:  Packages []
        testaptgetupdate "Get:1 file:  InRelease []
        # FIXME: Why omits the file transport the Packages Get line?
        #Get:3 file:  Packages []
        testaptgetupdate "Get:1 file:  InRelease []

-Ign file:  Translation-en

 Reading package lists..." "empty archive Packages.$COMPRESS over file"
 
        createemptyfile 'Packages'
        testaptgetupdate "Get:1 file:  InRelease []
 Reading package lists..." "empty archive Packages.$COMPRESS over file"
 
        createemptyfile 'Packages'
        testaptgetupdate "Get:1 file:  InRelease []

-Ign file:  Translation-en

 Err file:  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
 
 Err file:  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
 

-E: Some index files failed to download, they have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over file"
+E: Some index files failed to download. They have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over file"

 }
 
 testoverhttp() {
 }
 
 testoverhttp() {


@@ -107,7 +110,6 @@ testoverhttp() {
        testaptgetupdate "Get:1 http://localhost  InRelease []
 Get:2 http://localhost  Packages []
 Get:3 http://localhost  Translation-en
        testaptgetupdate "Get:1 http://localhost  InRelease []
 Get:2 http://localhost  Packages []
 Get:3 http://localhost  Translation-en

-Ign http://localhost  Translation-en

 Reading package lists..." "empty file en.$COMPRESS over http"
 
        createemptyarchive 'en'
 Reading package lists..." "empty file en.$COMPRESS over http"
 
        createemptyarchive 'en'


@@ -119,24 +121,22 @@ Reading package lists..." "empty archive en.$COMPRESS over http"
        createemptyarchive 'Packages'
        testaptgetupdate "Get:1 http://localhost  InRelease []
 Get:2 http://localhost  Packages []
        createemptyarchive 'Packages'
        testaptgetupdate "Get:1 http://localhost  InRelease []
 Get:2 http://localhost  Packages []

-Ign http://localhost  Translation-en

 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
 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

-Ign http://localhost  Translation-en

 Err http://localhost  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
 
 Err http://localhost  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
 

-E: Some index files failed to download, they have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over http"
+E: Some index files failed to download. They have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over http"

 }
 
 }
 

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

 
 # 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
+for COMPRESSOR in 'gzip' 'bzip2' 'lzma' 'xz'; do testoverhttp $COMPRESSOR; done