diff options
author | Michael Vogt <mvo@ubuntu.com> | 2014-09-05 14:47:22 +0200 |
---|---|---|
committer | Michael Vogt <mvo@ubuntu.com> | 2014-09-05 14:47:22 +0200 |
commit | 30b683f4f3021cd191ffef04bfaf2deb65820a52 (patch) | |
tree | b58771461581111f7bbbfd8d3e8eba012dc776ff /test/integration/test-ubuntu-bug-346386-apt-get-update-paywall | |
parent | e6e893903869635ab7ee3200f654129b08717ded (diff) | |
parent | 8c782efd93342c6119e8ba2ff6989b7a164b7f3d (diff) |
Merge remote-tracking branch 'upstream/debian/experimental' into feature/acq-trans
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 | 11 |
1 files changed, 5 insertions, 6 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 388c2bfdb..df2c69cf6 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,12 @@ 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 +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() { |