improve SOCKS error messages for http slightly

[apt.git] / test / integration / test-bug-617690-allow-unauthenticated-makes-all-untrusted

diff --git a/test/integration/test-bug-617690-allow-unauthenticated-makes-all-untrusted b/test/integration/test-bug-617690-allow-unauthenticated-makes-all-untrusted
index 1c2514938b759c575f84446c003caee18af8a786..533cf771fba085e9ba0eae22f3dab94106de2e3a 100755 (executable)
--- a/test/integration/test-bug-617690-allow-unauthenticated-makes-all-untrusted
+++ b/test/integration/test-bug-617690-allow-unauthenticated-makes-all-untrusted
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
 setupenvironment
 configarchitecture 'i386'
 
@@ -11,42 +11,58 @@ buildsimplenativepackage 'cool' 'i386' '1.0' 'unstable'
 setupaptarchive --no-update
 
 testfileexists() {
-       msgtest 'Test for existance of file' "$1"
+       msgtest 'Test for existence of file' "$1"
        test -e "$1" && msgpass || msgfail
        rm -f "$1"
 }
 
 testfilemissing() {
-       msgtest 'Test for non-existance of file' "$1"
+       msgtest 'Test for non-existence of file' "$1"
        test -e "$1" && msgfail || msgpass
        rm -f "$1"
 }
 
 testrun() {
        rm -rf rootdir/var/lib/apt
-       testsuccess aptget update
+       cd downloaded
 
-       testsuccess aptget download cool
-       testfileexists 'cool_1.0_i386.deb'
+       if [ "$1" = 'trusted' ]; then
+               testsuccess aptget update
+
+               testsuccess aptget download cool
+               testfileexists 'cool_1.0_i386.deb'
+
+               testsuccess aptget download cool --allow-unauthenticated
+               testfileexists 'cool_1.0_i386.deb'
+       else
+                testwarning aptget update --allow-insecure-repositories
 
-       mv aptarchive/pool/cool_1.0_i386.deb aptarchive/pool/cool_1.0_i386.deb.bak
-       echo 'this is not a good package' > aptarchive/pool/cool_1.0_i386.deb
-       # FIXME: apt-get download should exit non-zero if download fails
-       aptget download cool
+               testfailure aptget download cool
+               testfilemissing 'cool_1.0_i386.deb'
+
+               testsuccess aptget download cool --allow-unauthenticated
+               testfileexists 'cool_1.0_i386.deb'
+       fi
+
+       mv ../aptarchive/pool/cool_1.0_i386.deb ../aptarchive/pool/cool_1.0_i386.deb.bak
+       echo 'this is not a good package' > ../aptarchive/pool/cool_1.0_i386.deb
+       testfailure aptget download cool
        testfilemissing cool_1.0_i386.deb
 
-       # FIXME: apt-get download should exit non-zero if download fails
-       aptget download cool --allow-unauthenticated  # unauthenticated doesn't mean unchecked
+       testfailure aptget download cool --allow-unauthenticated  # unauthenticated doesn't mean unchecked
        testfilemissing cool_1.0_i386.deb
 
-       rm -f aptarchive/pool/cool_1.0_i386.deb
-       mv aptarchive/pool/cool_1.0_i386.deb.bak aptarchive/pool/cool_1.0_i386.deb
+       rm -f ../aptarchive/pool/cool_1.0_i386.deb
+       mv ../aptarchive/pool/cool_1.0_i386.deb.bak ../aptarchive/pool/cool_1.0_i386.deb
        testsuccess aptget download cool --allow-unauthenticated
        testfileexists 'cool_1.0_i386.deb'
+       cd - >/dev/null
 }
 
-testrun
+testrun 'trusted'
 
 find aptarchive/ \( -name 'Release.gpg' -o -name 'InRelease' \) -delete
-# FIXME: apt-get download should warn about untrusted downloads
-testrun
+testrun 'untrusted'
+
+changetowebserver
+testrun 'untrusted'