add --sha512 option + documentation for apt-ftparchive

[apt.git] / test / integration / test-apt-ftparchive-cachedb

diff --git a/test/integration/test-apt-ftparchive-cachedb b/test/integration/test-apt-ftparchive-cachedb
index 3454ee36a6b330987c3cfbf885c95be6e7fd0541..4edf26c220ce8ce0c9e7d12cf5360c3f051dbc08 100755 (executable)
--- a/test/integration/test-apt-ftparchive-cachedb
+++ b/test/integration/test-apt-ftparchive-cachedb
@@ -3,12 +3,12 @@ set -e
 
 ensure_correct_packages_file() {
     testequal "Package: foo
 
 ensure_correct_packages_file() {
     testequal "Package: foo

+Architecture: i386
+Version: 1

 Priority: optional
 Section: others
 Priority: optional
 Section: others

-$(dpkg-deb -I ./aptarchive/pool/main/foo_1_i386.deb | grep 'Installed-Size:' | sed 's#^ ##')

 Maintainer: Joe Sixpack <joe@example.org>
 Maintainer: Joe Sixpack <joe@example.org>

-Architecture: i386
-Version: 1
+$(dpkg-deb -I ./aptarchive/pool/main/foo_1_i386.deb | grep 'Installed-Size:' | sed 's#^ ##')

 Filename: pool/main/foo_1_i386.deb" head -n8 ./aptarchive/dists/test/main/binary-i386/Packages
 }
 
 Filename: pool/main/foo_1_i386.deb" head -n8 ./aptarchive/dists/test/main/binary-i386/Packages
 }
 


@@ -73,18 +73,16 @@ testsuccess aptftparchive generate ftparchive.conf -q=0 -o APT::FTPArchive::Show
 cp rootdir/tmp/testsuccess.output stats-out.txt
 ensure_correct_packages_file
 ensure_correct_contents_file
 cp rootdir/tmp/testsuccess.output stats-out.txt
 ensure_correct_packages_file
 ensure_correct_contents_file

-testsuccess grep Misses stats-out.txt
-testfileequal 'rootdir/tmp/testsuccess.output' ' Misses in Cache: 2
- dists/test/Contents-i386: New 402 B  Misses in Cache: 0'
+testsuccessequal ' Misses in Cache: 2
+ dists/test/Contents-i386: New 402 B  Misses in Cache: 0' grep Misses stats-out.txt

 
 # generate again
 testsuccess aptftparchive generate ftparchive.conf -q=0 -o APT::FTPArchive::ShowCacheMisses=1
 cp rootdir/tmp/testsuccess.output stats-out.txt
 ensure_correct_packages_file
 ensure_correct_contents_file
 
 # generate again
 testsuccess aptftparchive generate ftparchive.conf -q=0 -o APT::FTPArchive::ShowCacheMisses=1
 cp rootdir/tmp/testsuccess.output stats-out.txt
 ensure_correct_packages_file
 ensure_correct_contents_file

-testsuccess grep Misses stats-out.txt
-testfileequal 'rootdir/tmp/testsuccess.output' ' Misses in Cache: 0
- dists/test/Contents-i386:  Misses in Cache: 0'
+testsuccessequal ' Misses in Cache: 0
+ dists/test/Contents-i386:  Misses in Cache: 0' grep Misses stats-out.txt

 
 # and again (with removing the Packages file)
 rm -f ./aptarchive/dists/test/main/binary-i386/*
 
 # and again (with removing the Packages file)
 rm -f ./aptarchive/dists/test/main/binary-i386/*


@@ -93,9 +91,8 @@ testsuccess aptftparchive generate ftparchive.conf -q=0 -o APT::FTPArchive::Show
 cp rootdir/tmp/testsuccess.output stats-out.txt
 ensure_correct_packages_file
 ensure_correct_contents_file
 cp rootdir/tmp/testsuccess.output stats-out.txt
 ensure_correct_packages_file
 ensure_correct_contents_file

-testsuccess grep Misses stats-out.txt
-testfileequal 'rootdir/tmp/testsuccess.output' ' Misses in Cache: 0
- dists/test/Contents-i386: New 402 B  Misses in Cache: 0'
+testsuccessequal ' Misses in Cache: 0
+ dists/test/Contents-i386: New 402 B  Misses in Cache: 0' grep Misses stats-out.txt

 
 # and clean
 rm -rf aptarchive/pool/main/*
 
 # and clean
 rm -rf aptarchive/pool/main/*