X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/3e68f7e41022790619c698a32390a5256fadba7c..4ff5e237d5685be187a75c563b86e80ea3e7cc01:/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 df2c69cf6..a756b5df2 100755
--- 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'
@@ -13,13 +13,13 @@ insertsource 'unstable' 'unrelated' 'all' '1.0' 'stable'
 echo 'ni ni ni' > aptarchive/knights
 
 setupaptarchive
-changetowebserver -o 'aptwebserver::overwrite::.*::filename=/knights'
+changetowebserver -o 'aptwebserver::overwrite::.*InRelease::filename=/knights' -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
-    msgpass
+if downloadfile http://localhost:${APTHTTPPORT}/holygrail ./knights-talking >/dev/null; then
+	msgpass
 else
-    msgfail
+	msgfail
 fi
 
 testfileequal knights-talking 'ni ni ni'
@@ -34,30 +34,39 @@ ensure_n_canary_strings_in_dir() {
 	test "$N" = "$EXPECTED_N" && msgpass || msgfail "Expected $EXPECTED_N canaries, got $N"
 }
 
-LISTS='rootdir/var/lib/apt/lists'
-rm -rf rootdir/var/lib/apt/lists
-msgtest 'Got expected failure message' 'apt-get update'
-aptget update -qq 2>&1 | grep -q 'W:.*Does not start with a cleartext signature' && msgpass || msgfail
-
-ensure_n_canary_strings_in_dir $LISTS 'ni ni ni' 0
-testequal '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}
-done
-
-msgtest 'Got expected failure message in' 'apt-get update'
-aptget update -qq 2>&1 | grep -q 'W:.*Does not start with a cleartext signature' && msgpass || msgfail
-
-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
-rm -f $LISTS/localhost:8080_dists_stable_Release $LISTS/localhost:8080_dists_stable_Release.gpg
-msgtest 'excpected failure of' 'apt-get update'
-aptget update -qq 2>&1 | grep -q 'W:.*Does not start with a cleartext signature' && msgpass || msgfail
-
-ensure_n_canary_strings_in_dir $LISTS 'peng neee-wom' 3
-ensure_n_canary_strings_in_dir $LISTS 'ni ni ni' 0
+runtests() {
+	LISTS='rootdir/var/lib/apt/lists'
+	rm -rf "$LISTS"
+	testfailure aptget update
+	testsuccess grep "$1" rootdir/tmp/testfailure.output
+
+	ensure_n_canary_strings_in_dir "$LISTS" 'ni ni ni' 0
+	testequal 'lock
+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:${APTHTTPPORT}_dists_stable_${f}"
+		chmod 644 "$LISTS/localhost:${APTHTTPPORT}_dists_stable_${f}"
+	done
+
+	testfailure aptget update
+	testsuccess grep "$1" 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:${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 "$1" 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
+}
+runtests '^E:.*Clearsigned file .*NOSPLIT.*'
+webserverconfig 'aptwebserver::overwrite::.*InRelease::filename' '/404'
+runtests '^E:.*Signed file .*NODATA.*'