enhance apt-key debugging options

[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 388c2bfdb31b853eff6b3c7c3dcff1f692221fa7..ea516fc12b0ba4c01a68d2e55d1efafab0e56b07 100755 (executable)
--- a/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall
+++ b/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall
@@ -16,13 +16,12 @@ setupaptarchive
 changetowebserver -o 'aptwebserver::overwrite::.*::filename=/knights'
 
 msgtest 'Acquire test file from the webserver to check' 'overwrite'
 changetowebserver -o 'aptwebserver::overwrite::.*::filename=/knights'
 
 msgtest 'Acquire test file from the webserver to check' 'overwrite'

-echo '601 Configuration
-Config-Item: Acquire::http::DependOnSTDIN=0
+if downloadfile http://localhost:8080/holygrail ./knights-talking >/dev/null; then
+    msgpass
+else
+    msgfail
+fi

 
 

-600 Acquire URI
-URI: http://localhost:8080/holygrail
-Filename: knights-talking
-' | runapt ${METHODSDIR}/http >/dev/null 2>&1 && msgpass || msgfail

 testfileequal knights-talking 'ni ni ni'
 
 ensure_n_canary_strings_in_dir() {
 testfileequal knights-talking 'ni ni ni'
 
 ensure_n_canary_strings_in_dir() {


@@ -41,7 +40,8 @@ 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
 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
+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
 
 # 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