summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2014-09-03 16:54:16 +0200
committerMichael Vogt <mvo@ubuntu.com>2014-09-03 16:54:16 +0200
commit3b5607fc31371190470074371793cb8500b5139e (patch)
treea972f856f789dd7846d33d122992e0c66ba6b8d6
parent74c3db656df9e6cd02c60b8ee3155f9158f13708 (diff)
test/integration/test-ubuntu-bug-346386-apt-get-update-paywall: use downloadfile()
-rwxr-xr-xtest/integration/test-ubuntu-bug-346386-apt-get-update-paywall12
1 files changed, 5 insertions, 7 deletions
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 7112d2b45..a773660d2 100755
--- 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,11 @@ setupaptarchive
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
-
-600 Acquire URI
-URI: http://localhost:8080/holygrail
-Filename: knights-talking
-' | ${METHODSDIR}/http >/dev/null 2>&1 && msgpass || msgfail
+if downloadfile http://localhost:8080/holygrail ./knights-talking >/dev/null; then
+ msgpass
+else
+ msgfail
+fi
testfileequal knights-talking 'ni ni ni'
ensure_n_canary_strings_in_dir() {