display errortext for all Err as well as Ign logs

[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 2f127221a06f0627c5a36befd5b05b8996856295..fedf82c92f283cea89ec25ae6b07d188d000d5ff 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,11 +7,13 @@ setupenvironment
 configarchitecture "i386"
 
 buildaptarchive
+touch aptarchive/Packages
 setupflataptarchive
 
 testaptgetupdate() {
+       rm -rf rootdir/var/lib/apt
        aptget update 2>> testaptgetupdate.diff >> testaptgetupdate.diff || true
-       sed -i -e '/^Fetched / d' -e 's#\[[0-9]* [kMGTPY]*B\]#\[\]#' testaptgetupdate.diff
+       sed -i -e '/Ign /,+1d' -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 $*"
@@ -23,69 +25,81 @@ testaptgetupdate() {
        rm testaptgetupdate.diff
 }
 
-touch aptarchive/en.bz2
+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
+       signreleasefiles
+       rm -f aptarchive/Packages
+}
 
-testaptgetupdate "Ign file:  Release.gpg
-Ign file:$(readlink -f aptarchive)/  Translation-en
-Get:1 file:  Release []
-Reading package lists..." "empty file en.bz2 over file"
+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
+}
 
-rm aptarchive/en.bz2
-echo -n "" | bzip2 > aptarchive/en.bz2
+testoverfile() {
+       forcecompressor "$1"
 
-testaptgetupdate "Ign file:  Release.gpg
-Get:1 file:  Release []
-Reading package lists..." "empty archive en.bz2 over file"
+       createemptyfile 'en'
+       testaptgetupdate 'Reading package lists...' "empty file en.$COMPRESS over file"
 
-rm aptarchive/en.bz2
+       createemptyarchive 'en'
+       testaptgetupdate 'Reading package lists...' "empty archive en.$COMPRESS over file"
 
-# do the same again with http instead of file
-changetowebserver
+       createemptyarchive 'Packages'
+       # FIXME: Why omits the file transport the Packages Get line?
+       #Get:3 file:  Packages []
+       testaptgetupdate 'Reading package lists...' "empty archive Packages.$COMPRESS over file"
 
-touch aptarchive/en.bz2
+       createemptyfile 'Packages'
+       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
 
-testaptgetupdate "Ign http://localhost  Release.gpg
-Get:1 http://localhost/  Translation-en
-Get:2 http://localhost  Release []
-Ign http://localhost/  Translation-en
-Get:3 http://localhost  Packages []
-Reading package lists..." "empty file en.bz2 over http"
+E: Some index files failed to download. They have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over file"
+}
 
-rm aptarchive/en.bz2
-echo -n "" | bzip2 > aptarchive/en.bz2
+testoverhttp() {
+       forcecompressor "$1"
 
-testaptgetupdate "Ign http://localhost  Release.gpg
-Get:1 http://localhost/  Translation-en []
-Get:2 http://localhost  Release []
-Ign http://localhost  Packages/DiffIndex
-Get:3 http://localhost  Packages []
-Reading package lists..." "empty archive en.bz2 over http"
+       createemptyfile 'en'
+       testaptgetupdate "Get: http://localhost:8080  Packages []
+Get: http://localhost:8080  Translation-en
+Reading package lists..." "empty file en.$COMPRESS over http"
 
-rm aptarchive/en.bz2
+       createemptyarchive 'en'
+       testaptgetupdate "Get: http://localhost:8080  Packages []
+Get: http://localhost:8080  Translation-en []
+Reading package lists..." "empty archive en.$COMPRESS over http"
 
-rm aptarchive/Packages
-touch aptarchive/Packages
-buildaptarchivefromfiles
-
-testaptgetupdate "Ign http://localhost  Release.gpg
-Ign http://localhost/  Translation-en
-Get:1 http://localhost  Release []
-Ign http://localhost  Packages/DiffIndex
-Get:2 http://localhost  Packages []
-Reading package lists..." "empty archive Packages over http"
-
-find aptarchive/ -name 'Packages*' -type f -delete
-touch aptarchive/Packages.bz2
-aptftparchive release aptarchive/ > aptarchive/Release
-
-#FIXME: we should response with a good error message instead
-testaptgetupdate "Ign http://localhost  Release.gpg
-Ign http://localhost/  Translation-en
-Get:1 http://localhost  Release []
-Ign http://localhost  Packages/DiffIndex
-Get:2 http://localhost  Packages
-Err http://localhost  Packages
-  Undetermined Error
-W: Failed to fetch http://localhost:8080/Packages.bz2  Undetermined Error
-
-E: Some index files failed to download, they have been ignored, or old ones used instead." "empty file Packages over http"
+       createemptyarchive 'Packages'
+       testaptgetupdate "Get: 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: http://localhost:8080  Packages
+Err 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.${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"
+}
+
+for COMPRESSOR in 'gzip' 'bzip2' 'lzma' 'xz'; do testoverfile $COMPRESSOR; done
+
+# do the same again with http instead of file
+changetowebserver
+
+for COMPRESSOR in 'gzip' 'bzip2' 'lzma' 'xz'; do testoverhttp $COMPRESSOR; done