summaryrefslogtreecommitdiff
path: root/test/integration
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2017-06-30 16:33:09 +0200
committerJulian Andres Klode <jak@debian.org>2017-06-30 16:33:09 +0200
commitc6a428e4d17b408c2701def5daa46ca950948980 (patch)
tree57cb3552e76ff32f7b3a7a758dfa17c53db9d911 /test/integration
parent46c31341ef4b09bb3509ebbc49416e34b68e1be4 (diff)
Switch to 'http' as the default https method
The old curl based method is still available as 'curl', 'curl+http', and 'curl+https'.
Diffstat (limited to 'test/integration')
-rwxr-xr-xtest/integration/test-apt-update-failure-propagation2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/integration/test-apt-update-failure-propagation b/test/integration/test-apt-update-failure-propagation
index 9ca6e481f..fb2b92b8c 100755
--- a/test/integration/test-apt-update-failure-propagation
+++ b/test/integration/test-apt-update-failure-propagation
@@ -100,7 +100,7 @@ for FILE in rootdir/etc/apt/sources.list.d/*-stable-* ; do
sed -i -e "s#:${APTHTTPSPORT}/#:666/#" "$FILE"
done
testwarning aptget update -o Dir::Bin::Methods::https="${OLDMETHODS}/https"
-if grep -q WITH_CURL:BOOL=OFF $PROJECT_BINARY_DIR/CMakeCache.txt; then
+if grep -q FORCE_CURL:BOOL=OFF $PROJECT_BINARY_DIR/CMakeCache.txt; then
testequalor2 "W: Failed to fetch https://localhost:666/dists/stable/InRelease Failed to connect to localhost port 666: Connection refused
W: Some index files failed to download. They have been ignored, or old ones used instead." "W: Failed to fetch https://localhost:666/dists/stable/InRelease Could not connect to localhost:666 (127.0.0.1). - connect (111: Connection refused)
W: Some index files failed to download. They have been ignored, or old ones used instead." tail -n 2 rootdir/tmp/testwarning.output