add apt-key support for armored GPG key files (*.asc)

[apt.git] / test / integration / test-apt-update-transactions

diff --git a/test/integration/test-apt-update-transactions b/test/integration/test-apt-update-transactions
index a5dac1737a74d60b9b004a0dacfc5e9f9f740e65..ab678c133a8b45d2e4b88a88401c4b579b71c29e 100755 (executable)
--- a/test/integration/test-apt-update-transactions
+++ b/test/integration/test-apt-update-transactions
@@ -3,15 +3,15 @@ set -e
 
 # ensure that an update will only succeed entirely or not at all
 
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
 
 setupenvironment
 configarchitecture 'i386'
 configcompression '.' 'gz'
 
-insertpackage 'unstable' 'foo' 'all' '1.0'
-insertsource 'unstable' 'foo' 'all' '1.0'
+insertpackage 'unstable' 'foo' 'i386' '1.0'
+insertsource 'unstable' 'foo' 'i386' '1.0'
 
 setupaptarchive --no-update
 
@@ -31,8 +31,8 @@ restorefile() {
 testrun() {
        rm -rf aptarchive/dists.good
        cp -a aptarchive/dists aptarchive/dists.good
-       insertpackage 'unstable' 'bar' 'all' '1.0'
-       insertsource 'unstable' 'bar' 'all' '1.0'
+       insertpackage 'unstable' 'bar' 'i386' '1.0'
+       insertsource 'unstable' 'bar' 'i386' '1.0'
        buildaptarchivefromfiles '+1 hour'
 
        # produce an unsigned repository
@@ -44,7 +44,8 @@ testrun() {
        signreleasefiles
 
        onehashbroken() {
-               testfailure aptget update
+               rm -rf rootdir/var/lib/apt/lists/partial
+               testfailure aptget update -o Debug::pkgAcquire::Worker=1 -o Debug::Acquire::http=1
                # each file generates two messages with this string
                testequal '2' grep --count 'Hash Sum mismatch' rootdir/tmp/testfailure.output
                testfileequal "$1" "$(listcurrentlistsdirectory)"
@@ -81,7 +82,7 @@ testsetup 'file'
 changetowebserver
 webserverconfig 'aptwebserver::support::modified-since' 'false' "$1"
 webserverconfig 'aptwebserver::support::last-modified' 'false' "$1"  # curl is clever and sees hits here also
-webserverconfig 'aptwebserver::support::range' 'false' "$1"
+webserverconfig 'aptwebserver::response-header::Accept-Ranges' 'none' "$1"
 
 testsetup 'http'