implement socks5h proxy support for http method

[apt.git] / test / integration / test-apt-update-failure-propagation

diff --git a/test/integration/test-apt-update-failure-propagation b/test/integration/test-apt-update-failure-propagation
index eda9cff9902cf48590e0fe9c1243374f253af6b1..ec6bf4a48bcaf50cfbcf4384505ed1f4301d05d4 100755 (executable)
--- a/test/integration/test-apt-update-failure-propagation
+++ b/test/integration/test-apt-update-failure-propagation
@@ -16,7 +16,7 @@ rm "$NEWMETHODS"
 mkdir "$NEWMETHODS"
 backupIFS="$IFS"
 IFS="$(printf "\n\b")"
 mkdir "$NEWMETHODS"
 backupIFS="$IFS"
 IFS="$(printf "\n\b")"

-for METH in $(find "$OLDMETHODS" ! -type d); do
+for METH in $(find "$OLDMETHODS" -maxdepth 1 ! -type d); do

        ln -s "$OLDMETHODS/$(basename "$METH")" "$NEWMETHODS"
 done
 IFS="$backupIFS"
        ln -s "$OLDMETHODS/$(basename "$METH")" "$NEWMETHODS"
 done
 IFS="$backupIFS"


@@ -28,7 +28,7 @@ done
 
 pretest() {
        rm -rf rootdir/var/lib/apt/lists
 
 pretest() {
        rm -rf rootdir/var/lib/apt/lists

-       testsuccessequal 'N: Unable to locate package foo' aptcache policy foo -q=0
+       testsuccessequal 'N: Unable to locate package foo' aptcache policy foo

 }
 pretest
 testsuccess aptget update
 }
 pretest
 testsuccess aptget update


@@ -43,8 +43,10 @@ testsuccessequal "foo:
 
 pretest
 mv aptarchive/dists/stable aptarchive/dists/stable.good
 
 pretest
 mv aptarchive/dists/stable aptarchive/dists/stable.good

-testfailuremsg "E: The repository 'https://localhost:${APTHTTPSPORT} stable Release' does not have a Release file." apt update
-testfailure aptget update -q=0 --no-allow-insecure-repositories
+testfailuremsg "E: The repository 'https://localhost:${APTHTTPSPORT} stable Release' does not have a Release file.
+N: Updating from such a repository can't be done securely, and is therefore disabled by default.
+N: See apt-secure(8) manpage for repository creation and user configuration details." apt update
+testfailure aptget update --no-allow-insecure-repositories

 testequalor2 "Hit:1 http://localhost:${APTHTTPPORT} sid InRelease
 Ign:2 https://localhost:${APTHTTPSPORT} stable InRelease
   404  Not Found
 testequalor2 "Hit:1 http://localhost:${APTHTTPPORT} sid InRelease
 Ign:2 https://localhost:${APTHTTPSPORT} stable InRelease
   404  Not Found


@@ -52,7 +54,7 @@ Err:3 https://localhost:${APTHTTPSPORT} stable Release
   404  Not Found
 Reading package lists...
 E: The repository 'https://localhost:${APTHTTPSPORT} stable Release' does not have a Release file.
   404  Not Found
 Reading package lists...
 E: The repository 'https://localhost:${APTHTTPSPORT} stable Release' does not have a Release file.

-N: Updating such a repository securily is impossible and therefore disabled by default.
+N: Updating from such a repository can't be done securely, and is therefore disabled by default.

 N: See apt-secure(8) manpage for repository creation and user configuration details." "Ign:1 https://localhost:${APTHTTPSPORT} stable InRelease
   404  Not Found
 Err:2 https://localhost:${APTHTTPSPORT} stable Release
 N: See apt-secure(8) manpage for repository creation and user configuration details." "Ign:1 https://localhost:${APTHTTPSPORT} stable InRelease
   404  Not Found
 Err:2 https://localhost:${APTHTTPSPORT} stable Release


@@ -60,7 +62,7 @@ Err:2 https://localhost:${APTHTTPSPORT} stable Release
 Hit:3 http://localhost:${APTHTTPPORT} sid InRelease
 Reading package lists...
 E: The repository 'https://localhost:${APTHTTPSPORT} stable Release' does not have a Release file.
 Hit:3 http://localhost:${APTHTTPPORT} sid InRelease
 Reading package lists...
 E: The repository 'https://localhost:${APTHTTPSPORT} stable Release' does not have a Release file.

-N: Updating such a repository securily is impossible and therefore disabled by default.
+N: Updating from such a repository can't be done securely, and is therefore disabled by default.

 N: See apt-secure(8) manpage for repository creation and user configuration details." cat rootdir/tmp/testfailure.output
 
 mv aptarchive/dists/stable.good aptarchive/dists/stable
 N: See apt-secure(8) manpage for repository creation and user configuration details." cat rootdir/tmp/testfailure.output
 
 mv aptarchive/dists/stable.good aptarchive/dists/stable


@@ -77,7 +79,8 @@ posttest
 pretest
 rm "${NEWMETHODS}/https"
 testfailuremsg "E: The method driver ${TMPWORKINGDIRECTORY}/rootdir/usr/lib/apt/methods/https could not be found.
 pretest
 rm "${NEWMETHODS}/https"
 testfailuremsg "E: The method driver ${TMPWORKINGDIRECTORY}/rootdir/usr/lib/apt/methods/https could not be found.

-W: Failed to fetch https://localhost:${APTHTTPSPORT}/dists/stable/InRelease  
+N: Is the package apt-transport-https installed?
+E: Failed to fetch https://localhost:${APTHTTPSPORT}/dists/stable/InRelease  

 E: Some index files failed to download. They have been ignored, or old ones used instead." aptget update
 posttest
 
 E: Some index files failed to download. They have been ignored, or old ones used instead." aptget update
 posttest
 


@@ -87,6 +90,8 @@ for FILE in rootdir/etc/apt/sources.list.d/*-stable-* ; do
        # lets see how many testservers run also Doom
        sed -i -e "s#:${APTHTTPSPORT}/#:666/#" "$FILE"
 done
        # lets see how many testservers run also Doom
        sed -i -e "s#:${APTHTTPSPORT}/#:666/#" "$FILE"
 done

-testwarningmsg "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." aptget update
+testwarning aptget update
+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  couldn't connect to host
+W: Some index files failed to download. They have been ignored, or old ones used instead." tail -n 2 rootdir/tmp/testwarning.output

 posttest
 posttest