do not move not-failed pdiff-patches into CWD on failure

[apt.git] / test / integration / test-apt-update-expected-size

diff --git a/test/integration/test-apt-update-expected-size b/test/integration/test-apt-update-expected-size
index 24ca8513325f2149425757d2ac079a9fe4e7b795..079e94802a72e8dc3bb8718dc6d5d2fb1e32261a 100755 (executable)
--- a/test/integration/test-apt-update-expected-size
+++ b/test/integration/test-apt-update-expected-size
@@ -1,13 +1,13 @@
 #!/bin/sh
 set -e
 
 #!/bin/sh
 set -e
 

-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"

 
 setupenvironment
 configarchitecture "i386"
 
 
 setupenvironment
 configarchitecture "i386"
 

-insertpackage 'unstable' 'apt' 'all' '1.0'
+insertpackage 'unstable' 'apt' 'i386' '1.0'

 
 setupaptarchive --no-update
 cp -a aptarchive/dists aptarchive/dists.good
 
 setupaptarchive --no-update
 cp -a aptarchive/dists aptarchive/dists.good


@@ -26,7 +26,7 @@ test_inreleasetoobig() {
 }
 
 test_packagestoobig() {
 }
 
 test_packagestoobig() {

-       insertpackage 'unstable' 'foo' 'all' '1.0'
+       insertpackage 'unstable' 'foo' 'i386' '1.0'

        buildaptarchivefromfiles '+1 hour'
        signreleasefiles
        # append junk at the end of the Packages.gz/Packages
        buildaptarchivefromfiles '+1 hour'
        signreleasefiles
        # append junk at the end of the Packages.gz/Packages


@@ -71,7 +71,7 @@ methodtest() {
 }
 
 changetowebserver
 }
 
 changetowebserver

-methodtest 'http://localhost:8080'
+methodtest "http://localhost:${APTHTTPPORT}"

 
 changetohttpswebserver
 
 changetohttpswebserver

-methodtest 'https://localhost:4433'
+methodtest "https://localhost:${APTHTTPSPORT}"