drop privileges in copy:// method as we do for file://

[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 e4ce5f968d76ec55807c83da33a543808a663c8b..f144e9968a06c7ddeec74e0aa5a379319dfc087d 100755 (executable)
--- a/test/integration/test-apt-update-failure-propagation
+++ b/test/integration/test-apt-update-failure-propagation
@@ -37,14 +37,15 @@ testsuccessequal "foo:
   Candidate: 2
   Version table:
      2 500
-        500 http://localhost:${APTHTTPPORT} sid/main amd64 Packages
+        500 http://localhost:${APTHTTPPORT} sid/main all Packages
      1 500
-        500 https://localhost:${APTHTTPSPORT} stable/main amd64 Packages" aptcache policy foo
+        500 https://localhost:${APTHTTPSPORT} stable/main all Packages" aptcache policy foo
 
 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
-testfailureequal "Hit:1 http://localhost:${APTHTTPPORT} sid InRelease
+testfailure aptget update -q=0 --no-allow-insecure-repositories
+testequalor2 "Hit:1 http://localhost:${APTHTTPPORT} sid InRelease
 Ign:2 https://localhost:${APTHTTPSPORT} stable InRelease
   404  Not Found
 Err:3 https://localhost:${APTHTTPSPORT} stable Release
@@ -52,7 +53,16 @@ Err:3 https://localhost:${APTHTTPSPORT} stable Release
 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: See apt-secure(8) manpage for repository creation and user configuration details." aptget update -q=0 --no-allow-insecure-repositories
+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
+  404  Not Found
+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: 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
 posttest() {
        testsuccessequal "foo:
@@ -60,7 +70,7 @@ posttest() {
   Candidate: 2
   Version table:
      2 500
-        500 http://localhost:${APTHTTPPORT} sid/main amd64 Packages" aptcache policy foo
+        500 http://localhost:${APTHTTPPORT} sid/main all Packages" aptcache policy foo
 }
 posttest
 
@@ -77,6 +87,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
-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