add --sha512 option + documentation for apt-ftparchive

[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 23282bf861a54a4a8e50fda8bd022d373e1990b0..cef46a1b81ae249dc3ea459525b26897bd4b71ae 100755 (executable)
--- a/test/integration/test-apt-by-hash-update
+++ b/test/integration/test-apt-by-hash-update
@@ -11,9 +11,7 @@ insertpackage 'unstable' 'foo' 'all' '1.0'
 
 setupaptarchive --no-update
 
 
 setupaptarchive --no-update
 

-APTARCHIVE=$(readlink -f ./aptarchive)
-
-# make Packages *only* accessable by-hash for this test
+# make Packages *only* accessible 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* . &&
 mkdir -p aptarchive/dists/unstable/main/binary-i386/by-hash/SHA512
 (cd  aptarchive/dists/unstable/main/binary-i386/by-hash/SHA512 && 
      mv ../../Packages* . &&


@@ -26,24 +24,28 @@ mkdir -p aptarchive/dists/unstable/main/source/by-hash/SHA512
 )
 
 # we moved the Packages file away, normal update won't work
 )
 
 # we moved the Packages file away, normal update won't work

-testfailure aptget upate
+testfailure aptget update

 
 # ensure we do not know about "foo"
 
 # ensure we do not know about "foo"

-testequal "Reading package lists...
+testfailureequal "Reading package lists...

 Building dependency tree...
 E: Unable to locate package foo" aptget install -q -s foo
 
 # ensure we can apt-get update by hash
 Building dependency tree...
 E: Unable to locate package foo" aptget install -q -s foo
 
 # ensure we can apt-get update by hash

-testsuccess aptget update -o APT::Acquire::By-Hash=1
+testsuccess aptget update -o APT::Acquire::By-Hash=1 -o Acquire::Languages=none

 
 

-# ensure it works
-testequal "Inst foo (1.0 unstable [all])
+ensureitworks() {
+       testsuccessequal "Inst foo (1.0 unstable [all])

 Conf foo (1.0 unstable [all])" aptget install -qq -s foo
 Conf foo (1.0 unstable [all])" aptget install -qq -s foo

+}
+ensureitworks

 
 # add magic string to Release file ...
 MAGIC="Acquire-By-Hash: true"
 sed -i "s#Suite: unstable#Suite: unstable\n$MAGIC#" aptarchive/dists/unstable/Release
 signreleasefiles
 # ... and verify that it fetches by hash now
 
 # add magic string to Release file ...
 MAGIC="Acquire-By-Hash: true"
 sed -i "s#Suite: unstable#Suite: unstable\n$MAGIC#" aptarchive/dists/unstable/Release
 signreleasefiles
 # ... and verify that it fetches by hash now

-testsuccess aptget update
+rm -rf rootdir/var/lib/apt/lists
+testsuccess aptget update -o Acquire::Languages=none

 
 

+ensureitworks