summaryrefslogtreecommitdiff
path: root/test/integration
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2016-06-20 11:23:09 +0200
committerJulian Andres Klode <jak@debian.org>2016-06-20 17:25:26 +0200
commit7fb6227f5239e44ed2e7dfc8dd6f6fc801fba146 (patch)
treedd66e7676c713760f1ccfc07662db37adfec325c /test/integration
parent99043f83e5855dbf50b3a5c741072b095a48b051 (diff)
do not error if auto-detect-proxy cmd has no output
Regression introduced in 8f858d560e3b7b475c623c4e242d1edce246025a. Commands are probably better of always having output through as the fall through to the generic proxy settings is likely not intended. As documenting and implementing this more consistently is kind of a regression through, it is split off into the next commit. Closes: 827713 (cherry picked from commit cad1877559f3e1703c3fea4d081978e1b4bb4a0e)
Diffstat (limited to 'test/integration')
-rwxr-xr-xtest/integration/test-apt-helper8
1 files changed, 7 insertions, 1 deletions
diff --git a/test/integration/test-apt-helper b/test/integration/test-apt-helper
index b2347ddcf..157352479 100755
--- a/test/integration/test-apt-helper
+++ b/test/integration/test-apt-helper
@@ -61,7 +61,13 @@ E: Download Failed"
test_apt_helper_detect_proxy() {
# no proxy
testsuccessequal "Using proxy '' for URL 'http://example.com/'" apthelper auto-detect-proxy http://example.com/
-
+ cat > apt-proxy-detect <<'EOF'
+#!/bin/sh -e
+exit 0
+EOF
+ chmod 755 apt-proxy-detect
+ echo "Acquire::http::Proxy-Auto-Detect \"$(pwd)/apt-proxy-detect\";" > rootdir/etc/apt/apt.conf.d/02proxy-detect
+ testsuccessequal "Using proxy '' for URL 'http://www.example.com/'" apthelper auto-detect-proxy http://www.example.com
# http auto detect proxy script
cat > apt-proxy-detect <<'EOF'