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-apt-https-no-redirect | |
| parent | bc5095b7d708c7e376f98be6edc2ad7cceca57ed (diff) | |
| parent | 28460cb27846b2437010b08adf10bde18e370974 (diff) | |
Merge remote-tracking branch 'upstream/debian/sid' into debian/sid
Diffstat (limited to 'test/integration/test-apt-https-no-redirect')
| -rwxr-xr-x | test/integration/test-apt-https-no-redirect | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/test/integration/test-apt-https-no-redirect b/test/integration/test-apt-https-no-redirect index 73352a28c..bc744d6f2 100755 --- a/test/integration/test-apt-https-no-redirect +++ b/test/integration/test-apt-https-no-redirect @@ -25,6 +25,11 @@ msgtest 'download of a file does not work if' 'https redirected to http' downloadfile 'https://localhost:4433/redirectme/working' redirectfile >curloutput 2>&1 && msgfail || msgpass msgtest 'libcurl has forbidden access in last request to' 'http resource' -grep -q -- 'Protocol http not supported or disabled in libcurl' curloutput && msgpass || msgfail +if grep -q -E -- 'Protocol "?http"? not supported or disabled in libcurl' curloutput; then + msgpass +else + cat curloutput + msgfail +fi |