Merge remote-tracking branch 'upstream/debian/sid' into feature/apt-download-file

[apt.git] / test / integration / test-apt-https-no-redirect

diff --git a/test/integration/test-apt-https-no-redirect b/test/integration/test-apt-https-no-redirect
index 106d4bced9bea9029e278589b062f050d016e766..99419d1cc36714a045274fa0858621058bd06ace 100755 (executable)
--- a/test/integration/test-apt-https-no-redirect
+++ b/test/integration/test-apt-https-no-redirect
@@ -20,19 +20,6 @@ msgtest 'normal https download works'
 downloadfile 'https://localhost:4433/pool/apt_1.0/changelog' changelog > "$DOWNLOG" && msgpass || msgfail
 
 msgtest 'redirecting https to http does not work'
 downloadfile 'https://localhost:4433/pool/apt_1.0/changelog' changelog > "$DOWNLOG" && msgpass || msgfail
 
 msgtest 'redirecting https to http does not work'

-if ! downloadfile 'https://localhost:4433/redirectme/pool/apt_1.0/changelog' changelog3 > "$DOWNLOG"; then
-    msgpass
-else
-    cat >&2 "$DOWNLOG"
-    msgfail
-fi
-    
-msgtest 'https methods given proper error on redirect attempt'
-if grep -q 'Protocol http not supported or disabled in libcurl' "$DOWNLOG"; then
-    msgpass
-else
-    cat >&2 "$DOWNLOG"
-    msgfail
-fi
+downloadfile 'https://localhost:4433/redirectme/pool/apt_1.0/changelog' changelog3 2>&1 | grep "Protocol http not supported or disabled in libcurl" > /dev/null && msgpass || msgfail