Merge branch 'debian/sid' into debian/experimental

[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 633c197c03b97b5d5954290627a02a0d12ab7a7a..0736bb6dc598de4f07084f011edc0c83efc9ab93 100755 (executable)
--- a/test/integration/test-bug-617690-allow-unauthenticated-makes-all-untrusted
+++ b/test/integration/test-bug-617690-allow-unauthenticated-makes-all-untrusted
@@ -11,7 +11,7 @@ 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"
 }
@@ -24,15 +24,18 @@ testfilemissing() {
 
 testrun() {
        rm -rf rootdir/var/lib/apt
-       testsuccess aptget update
 
        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
+                testsuccess aptget update --allow-insecure-repositories
+
                testfailure aptget download cool
                testfilemissing 'cool_1.0_i386.deb'