diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2015-09-15 00:33:12 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2015-09-15 10:16:09 +0200 |
| commit | 6c0765c096ffb4df14169236c865bbb2b10974ae (patch) | |
| tree | d4b37ceb25dec384ba08007a8b83d0ab4a6b7f92 /test/integration/test-ubuntu-bug-346386-apt-get-update-paywall | |
| parent | af81ab9030229b4ce6cbe28f0f0831d4896fda01 (diff) | |
tests: don't use hardcoded port for http and https
This allows running tests in parallel.
Git-Dch: Ignore
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, 6 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 6ce6b5216..983889f92 100755 --- a/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall +++ b/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall @@ -16,7 +16,7 @@ setupaptarchive changetowebserver -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 +if downloadfile http://localhost:${APTHTTPPORT}/holygrail ./knights-talking >/dev/null; then msgpass else msgfail @@ -45,8 +45,8 @@ 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}" - chmod 644 "$LISTS/localhost:8080_dists_stable_${f}" + echo 'peng neee-wom' > "$LISTS/localhost:${APTHTTPPORT}_dists_stable_${f}" + chmod 644 "$LISTS/localhost:${APTHTTPPORT}_dists_stable_${f}" done testfailure aptget update @@ -56,9 +56,9 @@ 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" -chmod 644 "$LISTS/localhost:8080_dists_stable_InRelease" -rm -f "$LISTS/localhost:8080_dists_stable_Release" "$LISTS/localhost:8080_dists_stable_Release.gpg" +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 '^W:.*Clearsigned file .*NOSPLIT.*' rootdir/tmp/testfailure.output |