don't ask server if we have entire file in partial/

[apt.git] / test / integration / test-ubuntu-bug-346386-apt-get-update-paywall

diff --git a/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall b/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall
index 6ce6b5216bd4b2007ed844fa156b6d26ac2ee539..07c13434c24313da06243d1115db2fd7893dd4e4 100755 (executable)
--- a/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall
+++ b/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
 
 setupenvironment
 configarchitecture 'native'
@@ -16,7 +16,7 @@ setupaptarchive
 changetowebserver -o 'aptwebserver::overwrite::.*::filename=/knights'
 
 msgtest 'Acquire test file from the webserver to check' 'overwrite'
-if downloadfile http://localhost:8080/holygrail ./knights-talking >/dev/null; then
+if downloadfile http://localhost:${APTHTTPPORT}/holygrail ./knights-talking >/dev/null; then
        msgpass
 else
        msgfail
@@ -37,7 +37,7 @@ ensure_n_canary_strings_in_dir() {
 LISTS='rootdir/var/lib/apt/lists'
 rm -rf rootdir/var/lib/apt/lists
 testfailure aptget update
-testsuccess grep '^W:.*Clearsigned file .*NOSPLIT.*' rootdir/tmp/testfailure.output
+testsuccess grep '^E:.*Clearsigned file .*NOSPLIT.*' rootdir/tmp/testfailure.output
 
 ensure_n_canary_strings_in_dir "$LISTS" 'ni ni ni' 0
 testequal 'lock
@@ -45,23 +45,23 @@ partial' ls "$LISTS"
 
 # and again with pre-existing files with "valid data" which should remain
 for f in Release Release.gpg main_binary-amd64_Packages main_source_Sources; do
-       echo 'peng neee-wom' > "$LISTS/localhost:8080_dists_stable_${f}"
-       chmod 644 "$LISTS/localhost:8080_dists_stable_${f}"
+       echo 'peng neee-wom' > "$LISTS/localhost:${APTHTTPPORT}_dists_stable_${f}"
+       chmod 644 "$LISTS/localhost:${APTHTTPPORT}_dists_stable_${f}"
 done
 
 testfailure aptget update
-testsuccess grep '^W:.*Clearsigned file .*NOSPLIT.*' rootdir/tmp/testfailure.output
+testsuccess grep '^E:.*Clearsigned file .*NOSPLIT.*' rootdir/tmp/testfailure.output
 
 ensure_n_canary_strings_in_dir "$LISTS" 'peng neee-wom' 4
 ensure_n_canary_strings_in_dir "$LISTS" 'ni ni ni' 0
 
 # and now with a pre-existing InRelease file
-echo 'peng neee-wom' > "$LISTS/localhost:8080_dists_stable_InRelease"
-chmod 644 "$LISTS/localhost:8080_dists_stable_InRelease"
-rm -f "$LISTS/localhost:8080_dists_stable_Release" "$LISTS/localhost:8080_dists_stable_Release.gpg"
+echo 'peng neee-wom' > "$LISTS/localhost:${APTHTTPPORT}_dists_stable_InRelease"
+chmod 644 "$LISTS/localhost:${APTHTTPPORT}_dists_stable_InRelease"
+rm -f "$LISTS/localhost:${APTHTTPPORT}_dists_stable_Release" "$LISTS/localhost:${APTHTTPPORT}_dists_stable_Release.gpg"
 msgtest 'excpected failure of' 'apt-get update'
 testfailure aptget update
-testsuccess grep '^W:.*Clearsigned file .*NOSPLIT.*' rootdir/tmp/testfailure.output
+testsuccess grep '^E:.*Clearsigned file .*NOSPLIT.*' rootdir/tmp/testfailure.output
 
 ensure_n_canary_strings_in_dir "$LISTS" 'peng neee-wom' 3
 ensure_n_canary_strings_in_dir "$LISTS" 'ni ni ni' 0