diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2014-09-20 00:12:13 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2014-09-20 00:12:13 +0200 |
| commit | 2bd6be8ad24583ed9935f5c5d57c04ba7344111e (patch) | |
| tree | 702b5ce52a8003279da58bfe55ebf5aafd5ce0e9 | |
| parent | efcbb0f0c0ec92d6b61c6349a5ad69952939272e (diff) | |
relax grep to support newer curl output format
Git-Dch: Ignore
| -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 |