Просмотр исходного кода

relax grep to support newer curl output format

Git-Dch: Ignore
David Kalnischkies лет назад: 11
Родитель
Сommit
2bd6be8ad2
1 измененных файлов с 6 добавлено и 1 удалено
  1. 6 1
      test/integration/test-apt-https-no-redirect

+ 6 - 1
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