deprecate confusing Pkg.CandVersion() method

[apt.git] / test / integration / test-apt-by-hash-update

diff --git a/test/integration/test-apt-by-hash-update b/test/integration/test-apt-by-hash-update
index 9b97bdeba90c798072329249ba791b76f8eb54c1..9701f97f9f4a91bcd23cefc9c423f888f8ce3d64 100755 (executable)
--- a/test/integration/test-apt-by-hash-update
+++ b/test/integration/test-apt-by-hash-update
@@ -1,8 +1,8 @@
 #!/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'


@@ -10,6 +10,7 @@ confighashes 'SHA512'
 configcompression '.' 'gz'
 
 insertpackage 'unstable' 'foo' 'all' '1.0'
 configcompression '.' 'gz'
 
 insertpackage 'unstable' 'foo' 'all' '1.0'

+insertpackage 'unstable' 'bar' 'i386' '1.0'

 
 setupaptarchive --no-update
 
 
 setupaptarchive --no-update
 


@@ -22,6 +23,7 @@ makebyhashonly() {
        ln -s "${BYHASH}/${2}.gz" "${BYHASH}/$(sha512sum "${BYHASH}/${2}.gz" | cut -f1 -d' ')"
 }
 makebyhashonly 'binary-i386' 'Packages'
        ln -s "${BYHASH}/${2}.gz" "${BYHASH}/$(sha512sum "${BYHASH}/${2}.gz" | cut -f1 -d' ')"
 }
 makebyhashonly 'binary-i386' 'Packages'

+makebyhashonly 'binary-all' 'Packages'

 makebyhashonly 'source' 'Sources'
 
 ensureitsbroken() {
 makebyhashonly 'source' 'Sources'
 
 ensureitsbroken() {


@@ -46,6 +48,8 @@ ensureitworks() {
        testsuccess grep '^Ign' rootdir/tmp/aptupdate.output
        testsuccessequal "Inst foo (1.0 unstable [all])
 Conf foo (1.0 unstable [all])" aptget install -qq -s foo
        testsuccess grep '^Ign' rootdir/tmp/aptupdate.output
        testsuccessequal "Inst foo (1.0 unstable [all])
 Conf foo (1.0 unstable [all])" aptget install -qq -s foo

+       testsuccessequal "Inst bar (1.0 unstable [i386])
+Conf bar (1.0 unstable [i386])" aptget install -qq -s bar

 }
 msgmsg 'Test by-hash via' 'config option'
 ensureitworks -o Acquire::By-Hash=force
 }
 msgmsg 'Test by-hash via' 'config option'
 ensureitworks -o Acquire::By-Hash=force