X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/c511c5e8ed3f59ddee1b174b39e5cc16a2f11922..8757a0f:/test/integration/test-apt-by-hash-update?ds=sidebyside diff --git a/test/integration/test-apt-by-hash-update b/test/integration/test-apt-by-hash-update index 23282bf86..9701f97f9 100755 --- a/test/integration/test-apt-by-hash-update +++ b/test/integration/test-apt-by-hash-update @@ -1,49 +1,79 @@ #!/bin/sh set -e -TESTDIR=$(readlink -f $(dirname $0)) -. $TESTDIR/framework +TESTDIR="$(readlink -f "$(dirname "$0")")" +. "$TESTDIR/framework" setupenvironment -configarchitecture "i386" +configarchitecture 'i386' +confighashes 'SHA512' +configcompression '.' 'gz' insertpackage 'unstable' 'foo' 'all' '1.0' +insertpackage 'unstable' 'bar' 'i386' '1.0' setupaptarchive --no-update -APTARCHIVE=$(readlink -f ./aptarchive) +# make Packages *only* accessible by-hash for this test +makebyhashonly() { + local NORMAL="$(readlink -f "./aptarchive/dists/unstable/main/${1}")" + local BYHASH="${NORMAL}/by-hash/SHA512" + mkdir -p "${BYHASH}" + find "${NORMAL}/" -maxdepth 1 -name "${2}*" -exec mv '{}' "$BYHASH" \; + ln -s "${BYHASH}/${2}.gz" "${BYHASH}/$(sha512sum "${BYHASH}/${2}.gz" | cut -f1 -d' ')" +} +makebyhashonly 'binary-i386' 'Packages' +makebyhashonly 'binary-all' 'Packages' +makebyhashonly 'source' 'Sources' -# make Packages *only* accessable by-hash for this test -mkdir -p aptarchive/dists/unstable/main/binary-i386/by-hash/SHA512 -(cd aptarchive/dists/unstable/main/binary-i386/by-hash/SHA512 && - mv ../../Packages* . && - ln -s Packages.gz $(sha512sum Packages.gz|cut -f1 -d' ') ) - -# add sources -mkdir -p aptarchive/dists/unstable/main/source/by-hash/SHA512 -(cd aptarchive/dists/unstable/main/source/by-hash/SHA512 && - ln -s ../../Sources.gz $(sha512sum ../../Sources.gz|cut -f1 -d' ') -) - -# we moved the Packages file away, normal update won't work -testfailure aptget upate - -# ensure we do not know about "foo" -testequal "Reading package lists... +ensureitsbroken() { + rm -rf rootdir/var/lib/apt/lists + # we moved the Packages file away, normal update won't work + testfailure aptget update "$@" + # ensure we do not know about "foo" + testfailureequal "Reading package lists... Building dependency tree... E: Unable to locate package foo" aptget install -q -s foo +} +ensureitsbroken +ensureitsbroken -o Acquire::By-Hash=1 -# ensure we can apt-get update by hash -testsuccess aptget update -o APT::Acquire::By-Hash=1 - -# ensure it works -testequal "Inst foo (1.0 unstable [all]) +ensureitworks() { + rm -rf rootdir/var/lib/apt/lists + testsuccess aptget update "$@" -o Acquire::Languages=none + testfailure grep '^Ign' rootdir/tmp/testsuccess.output + rm -rf rootdir/var/lib/apt/lists + testsuccess aptget update "$@" + cp -f rootdir/tmp/testsuccess.output rootdir/tmp/aptupdate.output + 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' 'release option' +cp -a aptarchive/dists aptarchive/dists.bak # add magic string to Release file ... -MAGIC="Acquire-By-Hash: true" -sed -i "s#Suite: unstable#Suite: unstable\n$MAGIC#" aptarchive/dists/unstable/Release +sed -i '/^Suite: / a \ +Acquire-By-Hash: yes' aptarchive/dists/unstable/Release signreleasefiles -# ... and verify that it fetches by hash now -testsuccess aptget update +ensureitworks +ensureitsbroken -o Acquire::By-Hash=0 + +msgmsg 'Test by-hash via' 'sources option' +sed -i "s#^\(deb\(-src\)\?\) #\1 [by-hash=yes] #" rootdir/etc/apt/sources.list.d/* +ensureitworks +#ensureitsbroken -o Acquire::By-Hash=0 + +rm -rf aptarchive/dists +cp -a aptarchive/dists.bak aptarchive/dists +#ensureitworks -o Acquire::By-Hash=force +ensureitsbroken -o Acquire::By-Hash=1 +ensureitsbroken -o Acquire::By-Hash=0 +sed -i "s#^\(deb\(-src\)\?\) \[by-hash=yes\] #\1 [by-hash=force] #" rootdir/etc/apt/sources.list.d/* +ensureitworks +#ensureitsbroken -o Acquire::By-Hash=0