diff options
Diffstat (limited to 'test/integration/test-bug-595691-empty-and-broken-archive-files')
| -rwxr-xr-x | test/integration/test-bug-595691-empty-and-broken-archive-files | 50 |
1 files changed, 15 insertions, 35 deletions
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 8d06f09c0..d71bd2ce5 100755 --- a/test/integration/test-bug-595691-empty-and-broken-archive-files +++ b/test/integration/test-bug-595691-empty-and-broken-archive-files @@ -10,35 +10,28 @@ buildaptarchive touch aptarchive/Packages setupflataptarchive -testaptgetupdate() { +failureupdate() { rm -rf rootdir/var/lib/apt - 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 $*" - if [ -z "$GIVEN" ]; then - echo -n "" | checkdiff - testaptgetupdate.diff && msgpass || msgfail - else - echo "$GIVEN" | checkdiff - testaptgetupdate.diff && msgpass || msgfail - fi - rm testaptgetupdate.diff + testfailure aptget update --allow-insecure-repositories + testsuccess grep "^E: Failed to fetch store:${1} Empty files can't be valid archives$" rootdir/tmp/testfailure.output +} +successupdate() { + rm -rf rootdir/var/lib/apt + testwarning aptget update --allow-insecure-repositories } createemptyarchive() { find aptarchive/ \( -name "Packages*" -o -name "en*" \) -type f -delete touch aptarchive/Packages echo -n "" | $COMPRESSOR_CMD > aptarchive/${1}.$COMPRESS - generatereleasefiles - signreleasefiles + find aptarchive -name '*Release*' -delete rm -f aptarchive/Packages } createemptyfile() { find aptarchive/ \( -name "Packages*" -o -name "en*" \) -type f -delete touch aptarchive/Packages aptarchive/${1}.$COMPRESS - generatereleasefiles - signreleasefiles + find aptarchive -name '*Release*' -delete rm -f aptarchive/Packages } @@ -46,34 +39,21 @@ testoverfile() { local APTARCHIVE="$(readlink -f ./aptarchive)" forcecompressor "$1" + msgmsg 'archive over file' "Packages.$COMPRESS" createemptyarchive 'Packages' - testaptgetupdate "Get:2 file:$APTARCHIVE Packages [] -Reading package lists..." "empty archive Packages.$COMPRESS over file" - + successupdate createemptyfile 'Packages' - testaptgetupdate "Get:2 file:$APTARCHIVE Packages -Err:2 file:$APTARCHIVE Packages - Empty files can't be valid archives -Reading package lists... -E: Failed to fetch store:$(readlink -f rootdir/var/lib/apt/lists/partial/$(echo "$APTARCHIVE" | sed -e 's#/#_#g')_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" + failureupdate "$(readlink -f rootdir/var/lib/apt/lists/partial/$(echo "$APTARCHIVE" | sed -e 's#/#_#g')_Packages.${COMPRESS})" } testoverhttp() { forcecompressor "$1" + msgmsg 'archive over http' "Packages.$COMPRESS" createemptyarchive 'Packages' - testaptgetupdate "Get:2 http://localhost:${APTHTTPPORT} Packages [] -Reading package lists..." "empty archive Packages.$COMPRESS over http" - + successupdate createemptyfile 'Packages' - #FIXME: we should response with a good error message instead - testaptgetupdate "Get:2 http://localhost:${APTHTTPPORT} Packages -Err:2 http://localhost:${APTHTTPPORT} Packages - Empty files can't be valid archives -Reading package lists... -E: Failed to fetch store:$(readlink -f rootdir/var/lib/apt/lists/partial/localhost:${APTHTTPPORT}_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" + failureupdate "$(readlink -f rootdir/var/lib/apt/lists/partial/localhost:${APTHTTPPORT}_Packages.${COMPRESS})" } forallsupportedcompressors testoverfile |