test fixes

test/integration/test-apt-update-rollback

@@ -114,7 +114,7 @@ test_unauthenticated_to_invalid_inrelease() {
     rm $APTARCHIVE/dists/unstable/Release.gpg
     avoid_ims_hit
     
-    testsuccess aptget update -qq
+    testsuccess aptget update -qq --allow-unauthenticated
     testequal "WARNING: The following packages cannot be authenticated!
   old
 E: There are problems and -y was used without --force-yes" aptget install -qq -y old

test/integration/test-apt-update-unauth

@@ -8,6 +8,8 @@ set -e
 TESTDIR=$(readlink -f $(dirname $0))
 . $TESTDIR/framework
 
+umask 022
+
 setupenvironment
 configarchitecture "i386"
 

test/integration/test-bug-617690-allow-unauthenticated-makes-all-untrusted

@@ -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-unauthenticated
+
 		testfailure aptget download cool
 		testfilemissing 'cool_1.0_i386.deb'
 

test/integration/test-bug-728500-tempdir

@@ -17,7 +17,7 @@ msgtest 'Test apt-get update with incorrect' 'TMPDIR'
 OUTPUT=$(mktemp)
 addtrap "rm $OUTPUT;"
 export TMPDIR=/does-not-exists
-if aptget update >${OUTPUT} 2>&1; then
+if aptget update -o Debug::Acquire::gpg=1 >${OUTPUT} 2>&1; then
 	msgpass
 else
 	echo