diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-10-27 15:57:12 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-10-27 15:57:12 +0100 |
| commit | e29a7a394cfd41e8bad81535e0a8c07654f34bf6 (patch) | |
| tree | c317e2f45aa1c96300028fb830555f248db5771e /test/integration/test-ubuntu-bug-346386-apt-get-update-paywall | |
| parent | bc5095b7d708c7e376f98be6edc2ad7cceca57ed (diff) | |
| parent | 28460cb27846b2437010b08adf10bde18e370974 (diff) | |
Merge remote-tracking branch 'upstream/debian/sid' into debian/sid
Diffstat (limited to 'test/integration/test-ubuntu-bug-346386-apt-get-update-paywall')
| -rwxr-xr-x | test/integration/test-ubuntu-bug-346386-apt-get-update-paywall | 12 |
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() { |