merged from lp:~mvo/apt/mvo (which is really lp:~donkult/apt/sid with some updated...

[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 c5379dca030cb216c728c6f189508b596f768876..684559aa7a05e1d9585a0d415632261240e80afe 100755 (executable)
--- a/test/integration/test-bug-595691-empty-and-broken-archive-files
+++ b/test/integration/test-bug-595691-empty-and-broken-archive-files
@@ -32,7 +32,7 @@ createemptyarchive() {
        fi
        touch aptarchive/Packages
        echo -n "" | $COMPRESSOR > aptarchive/${1}.$COMPRESS
-       aptftparchive release aptarchive/ > aptarchive/Release
+       generatereleasefiles
        signreleasefiles
        rm -f aptarchive/Packages
 }
@@ -43,7 +43,7 @@ createemptyfile() {
                echo -n "" | $COMPRESSOR > aptarchive/Packages.$COMPRESS
        fi
        touch aptarchive/Packages aptarchive/${1}.$COMPRESS
-       aptftparchive release aptarchive/ > aptarchive/Release
+       generatereleasefiles
        signreleasefiles
        rm -f aptarchive/Packages
 }
@@ -56,6 +56,7 @@ setupcompressor() {
        lzma) COMPRESS="lzma";;
        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
@@ -75,7 +76,7 @@ testoverfile() {
 
        createemptyfile 'en'
        testaptgetupdate "Get:1 file:  InRelease []
-Ign file:$(readlink -f aptarchive)/  Translation-en
+Ign file:  Translation-en
 Reading package lists..." "empty file en.$COMPRESS over file"
 
        createemptyarchive 'en'
@@ -85,16 +86,16 @@ 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 []
-       testaptgetupdate "Ign file:$(readlink -f aptarchive)/  Translation-en
-Get:1 file:  InRelease []
+       testaptgetupdate "Get:1 file:  InRelease []
+Ign file:  Translation-en
 Reading package lists..." "empty archive Packages.$COMPRESS over file"
 
        createemptyfile 'Packages'
-       testaptgetupdate "Ign file:$(readlink -f aptarchive)/  Translation-en
-Get:1 file:  InRelease []
+       testaptgetupdate "Get:1 file:  InRelease []
+Ign file:  Translation-en
 Err file:  Packages
-  Undetermined Error
-W: Failed to fetch file:$(readlink -f aptarchive/Packages.$COMPRESS)  Undetermined Error
+  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"
 }
@@ -104,31 +105,31 @@ testoverhttp() {
 
        createemptyfile 'en'
        testaptgetupdate "Get:1 http://localhost  InRelease []
-Get:2 http://localhost/  Translation-en
-Get:3 http://localhost  Packages []
-Ign http://localhost/  Translation-en
+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'
        testaptgetupdate "Get:1 http://localhost  InRelease []
-Get:2 http://localhost/  Translation-en []
-Get:3 http://localhost  Packages []
+Get:2 http://localhost  Packages []
+Get:3 http://localhost  Translation-en []
 Reading package lists..." "empty archive en.$COMPRESS over http"
 
        createemptyarchive 'Packages'
        testaptgetupdate "Get:1 http://localhost  InRelease []
-Ign http://localhost/  Translation-en
 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 []
-Ign http://localhost/  Translation-en
 Get:2 http://localhost  Packages
+Ign http://localhost  Translation-en
 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"
 }