deprecate confusing Pkg.CandVersion() method

[apt.git] / test / integration / test-apt-helper

diff --git a/test/integration/test-apt-helper b/test/integration/test-apt-helper
index b78201ef0fcb4f0454d335093eedef4102fb97a7..8a25859b840e2dbd7d57eaa57a5e615110445a12 100755 (executable)
--- a/test/integration/test-apt-helper
+++ b/test/integration/test-apt-helper
@@ -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'


@@ -34,14 +34,27 @@ test_apt_helper_download() {
     msgtest 'apt-file download-file' 'wrong md5sum'
     testfailure --nomsg apthelper -qq download-file "${1}/foo" './downloaded/foo5' 'MD5Sum:aabbcc'
     testfileequal rootdir/tmp/testfailure.output "E: Failed to fetch ${1}/foo  Hash Sum mismatch
     msgtest 'apt-file download-file' 'wrong md5sum'
     testfailure --nomsg apthelper -qq download-file "${1}/foo" './downloaded/foo5' 'MD5Sum:aabbcc'
     testfileequal rootdir/tmp/testfailure.output "E: Failed to fetch ${1}/foo  Hash Sum mismatch

-
+   Hashes of expected file:
+    - MD5Sum:aabbcc
+   Hashes of received file:
+    - SHA512:0cf9180a764aba863a67b6d72f0918bc131c6772642cb2dce5a34f0a702f9470ddc2bf125c12198b1995c233c34b4afd346c54a2334c350a948a51b6e8b4e6b6
+    - SHA256:b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c
+    - SHA1:f1d2d2f924e986ac86fdf7b36c94bcdf32beec15
+    - MD5Sum:d3b07384d113edec49eaa6238ad5ff00
+    - Checksum-FileSize:4
+   Last modification reported: $(lastmodification 'aptarchive/foo')

 E: Download Failed"
     testfileequal ./downloaded/foo5.FAILED 'foo'
 
     msgtest 'apt-file download-file' 'wrong sha256'
     testfailure --nomsg apthelper -qq download-file "${1}/foo" './downloaded/foo6' 'SHA256:aabbcc'
     testfileequal rootdir/tmp/testfailure.output "E: Failed to fetch ${1}/foo  Hash Sum mismatch
 E: Download Failed"
     testfileequal ./downloaded/foo5.FAILED 'foo'
 
     msgtest 'apt-file download-file' 'wrong sha256'
     testfailure --nomsg apthelper -qq download-file "${1}/foo" './downloaded/foo6' 'SHA256:aabbcc'
     testfileequal rootdir/tmp/testfailure.output "E: Failed to fetch ${1}/foo  Hash Sum mismatch

-
+   Hashes of expected file:
+    - SHA256:aabbcc
+   Hashes of received file:
+    - SHA256:b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c
+    - Checksum-FileSize:4
+   Last modification reported: $(lastmodification 'aptarchive/foo')

 E: Download Failed"
     testfileequal './downloaded/foo6.FAILED' 'foo'
 
 E: Download Failed"
     testfileequal './downloaded/foo6.FAILED' 'foo'
 


@@ -95,6 +108,6 @@ testfailureequal 'E: Must specify at least one pair url/filename' apthelper down
 testfailureequal 'E: Must specify at least one pair url/filename' apthelper download-file 'http://example.org/'
 testfailureequal 'E: Need one URL as argument' apthelper auto-detect-proxy
 testfailureequal 'E: Must specify at least one SRV record' apthelper srv-lookup
 testfailureequal 'E: Must specify at least one pair url/filename' apthelper download-file 'http://example.org/'
 testfailureequal 'E: Need one URL as argument' apthelper auto-detect-proxy
 testfailureequal 'E: Must specify at least one SRV record' apthelper srv-lookup

-testfailureequal 'E: GetSrvRec failed for localhost' apthelper srv-lookup 'localhost'
-testfailureequal "E: GetSrvRec failed for localhost:${APTHTTPPORT}" apthelper srv-lookup "localhost:${APTHTTPPORT}"
-testfailureequal "E: GetSrvRec failed for localhost:${APTHTTPSPORT}" apthelper srv-lookup "localhost:${APTHTTPSPORT}"
+testfailureequal 'E: GetSrvRec failed for localhost' apthelper -q=1 srv-lookup 'localhost'
+testfailureequal "E: GetSrvRec failed for localhost:${APTHTTPPORT}" apthelper -q=1 srv-lookup "localhost:${APTHTTPPORT}"
+testfailureequal "E: GetSrvRec failed for localhost:${APTHTTPSPORT}" apthelper -q=1 srv-lookup "localhost:${APTHTTPSPORT}"