diff options
| author | Michael Vogt <mvo@debian.org> | 2014-03-12 20:40:01 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-03-12 20:40:01 +0100 |
| commit | 32120cde98308448fbcd31cf7841f13a86d3e0a8 (patch) | |
| tree | 102ec9f093480109c14d7f0450bc4a584d42a4c0 /test/integration | |
| parent | c1409d1be88557529c62883be3174793481233de (diff) | |
| parent | 9e3142e16c2ccb4b51f5a8122f5a8e8c0fab9f9a (diff) | |
Merge remote-tracking branch 'upstream/debian/sid' into feature/apt-download-file
Conflicts:
cmdline/apt-helper.cc
test/integration/framework
test/integration/test-apt-https-no-redirect
Diffstat (limited to 'test/integration')
| -rwxr-xr-x | test/integration/test-apt-https-no-redirect | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/test/integration/test-apt-https-no-redirect b/test/integration/test-apt-https-no-redirect index 106d4bced..99419d1cc 100755 --- 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' -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 |