merge patches from daniel to fix merge artifact and test failure

[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 11a5025d2c94c28013ce3c8095ebd9d4fc5ce763..4611b8b8eaa2b1834c1128411b6b82293f78976b 100755 (executable)
--- a/test/integration/test-bug-595691-empty-and-broken-archive-files
+++ b/test/integration/test-bug-595691-empty-and-broken-archive-files
@@ -7,12 +7,13 @@ setupenvironment
 configarchitecture "i386"
 
 buildaptarchive
 configarchitecture "i386"
 
 buildaptarchive

+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 '/Release/ d' -e 's#Get:[0-9]\+ #Get: #' -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 $*"


@@ -27,11 +28,11 @@ 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
-       aptftparchive release aptarchive/ > aptarchive/Release
+       echo -n "" | $COMPRESSOR_CMD > aptarchive/${1}.$COMPRESS
+       generatereleasefiles

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


@@ -39,33 +40,40 @@ 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
        fi
        touch aptarchive/Packages aptarchive/${1}.$COMPRESS

-       aptftparchive release aptarchive/ > aptarchive/Release
+       generatereleasefiles

        signreleasefiles
        rm -f aptarchive/Packages
 }
 
 setupcompressor() {
        COMPRESSOR="$1"
        signreleasefiles
        rm -f aptarchive/Packages
 }
 
 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}\"; };
        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::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
 }
 


@@ -73,76 +81,54 @@ testoverfile() {
        setupcompressor "$1"
 
        createemptyfile 'en'
        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"
+       testaptgetupdate 'Reading package lists...' "empty file en.$COMPRESS over file"

 
        createemptyarchive 'en'
 
        createemptyarchive 'en'

-       testaptgetupdate "Get:1 file:  Release.gpg []
-Get:2 file:  Release []
-Reading package lists..." "empty archive en.$COMPRESS over file"
+       testaptgetupdate 'Reading package lists...' "empty archive en.$COMPRESS over file"

 
        createemptyarchive 'Packages'
        # FIXME: Why omits the file transport the Packages Get line?
        #Get:3 file:  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"
+       testaptgetupdate 'Reading package lists...' "empty archive Packages.$COMPRESS over file"

 
        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"
+       testaptgetupdate "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"

 }
 
 testoverhttp() {
        setupcompressor "$1"
 
        createemptyfile 'en'
 }
 
 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 []
+       testaptgetupdate "Get: http://localhost  Packages []
+Get: 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'

-       testaptgetupdate "Get:1 http://localhost  Release.gpg []
-Get:2 http://localhost/  Translation-en []
-Get:3 http://localhost  Release []
-Get:4 http://localhost  Packages []
+       testaptgetupdate "Get: http://localhost  Packages []
+Get: http://localhost  Translation-en []

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

-       testaptgetupdate "Get:1 http://localhost  Release.gpg []
-Ign http://localhost/  Translation-en
-Get:2 http://localhost  Release []
-Get:3 http://localhost  Packages []
+       testaptgetupdate "Get: http://localhost  Packages []

 Reading package lists..." "empty archive Packages.$COMPRESS over http"
 
        createemptyfile 'Packages'
        #FIXME: we should response with a good error message instead
 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  Release.gpg []
-Ign http://localhost/  Translation-en
-Get:2 http://localhost  Release []
-Get:3 http://localhost  Packages
+       testaptgetupdate "Get: http://localhost  Packages

 Err http://localhost  Packages
 Err http://localhost  Packages

-  Undetermined Error
-W: Failed to fetch http://localhost:8080/Packages.$COMPRESS  Undetermined Error
+  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