test fixes

diff --git a/test/integration/test-apt-update-rollback b/test/integration/test-apt-update-rollback
index a88b0042b2a7f4a538d62e45b5f70427d7b1e76e..e37be9554f2943544dde8f9b729028ef20ae2dd7 100755 (executable)
--- a/test/integration/test-apt-update-rollback
+++ b/test/integration/test-apt-update-rollback
@@ -114,7 +114,7 @@ test_unauthenticated_to_invalid_inrelease() {
     rm $APTARCHIVE/dists/unstable/Release.gpg
     avoid_ims_hit
     
     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
     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

diff --git a/test/integration/test-apt-update-unauth b/test/integration/test-apt-update-unauth
index 2e46e3acee0502c2434ef859b71692bb867dd19e..5db8a3c16948521be746db858fc27eddcc2c28f7 100755 (executable)
--- a/test/integration/test-apt-update-unauth
+++ b/test/integration/test-apt-update-unauth
@@ -8,6 +8,8 @@ set -e
 TESTDIR=$(readlink -f $(dirname $0))
 . $TESTDIR/framework
 
 TESTDIR=$(readlink -f $(dirname $0))
 . $TESTDIR/framework
 

+umask 022
+

 setupenvironment
 configarchitecture "i386"
 
 setupenvironment
 configarchitecture "i386"
 

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 f93510fd76ed0083dcf927b16565a7c02318fadf..276e10564fcfbfcc54721859dc09ac5c16ed160f 100755 (executable)
--- a/test/integration/test-bug-617690-allow-unauthenticated-makes-all-untrusted
+++ b/test/integration/test-bug-617690-allow-unauthenticated-makes-all-untrusted
@@ -24,15 +24,18 @@ testfilemissing() {
 
 testrun() {
        rm -rf rootdir/var/lib/apt
 
 testrun() {
        rm -rf rootdir/var/lib/apt

-       testsuccess aptget update

 
        if [ "$1" = 'trusted' ]; then
 
        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 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'
 
                testfailure aptget download cool
                testfilemissing 'cool_1.0_i386.deb'
 

diff --git a/test/integration/test-bug-728500-tempdir b/test/integration/test-bug-728500-tempdir
index 0451fc1ed97ca3e0d11fbef4800b38caa85e1c6a..e9df0a70994658f614e1ea8e3ca17478680c99a1 100755 (executable)
--- a/test/integration/test-bug-728500-tempdir
+++ b/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
 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
        msgpass
 else
        echo