X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/43acd01979039b248cb7f033b82e36d778d0ebec..29636cc759c6fbb92c6c462c90611eefb67cbbd4:/test/integration/test-apt-helper?ds=sidebyside

diff --git a/test/integration/test-apt-helper b/test/integration/test-apt-helper
index 42c40bb9e..8a25859b8 100755
--- a/test/integration/test-apt-helper
+++ b/test/integration/test-apt-helper
@@ -1,48 +1,79 @@
 #!/bin/sh
 set -e
 
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
 
 setupenvironment
 configarchitecture 'i386'
 
 changetohttpswebserver
 
+echo 'foo' > aptarchive/foo
+echo 'bar' > aptarchive/foo2
+
 test_apt_helper_download() {
-    echo 'foo' > aptarchive/foo
+    msgmsg 'Test with' "$1"
 
     msgtest 'apt-file download-file' 'md5sum'
-    apthelper -qq download-file http://localhost:8080/foo foo2 MD5Sum:d3b07384d113edec49eaa6238ad5ff00 && msgpass || msgfail
-    testfileequal foo2 'foo'
+    testsuccess --nomsg apthelper download-file "${1}/foo" './downloaded/foo2' 'MD5Sum:d3b07384d113edec49eaa6238ad5ff00'
+    testfileequal ./downloaded/foo2 'foo'
 
     msgtest 'apt-file download-file' 'sha1'
-    apthelper -qq download-file http://localhost:8080/foo foo1 SHA1:f1d2d2f924e986ac86fdf7b36c94bcdf32beec15 && msgpass || msgfail
-    testfileequal foo1 'foo'
+    testsuccess --nomsg apthelper download-file "${1}/foo" './downloaded/foo1' 'SHA1:f1d2d2f924e986ac86fdf7b36c94bcdf32beec15'
+    testfileequal ./downloaded/foo1 'foo'
 
     msgtest 'apt-file download-file' 'sha256'
-    apthelper -qq download-file http://localhost:8080/foo foo3 SHA256:b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c && msgpass || msgfail
-    testfileequal foo3 'foo'
+    testsuccess --nomsg apthelper download-file "${1}/foo" './downloaded/foo3' 'SHA256:b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c'
+    testfileequal ./downloaded/foo3 'foo'
 
     msgtest 'apt-file download-file' 'no-hash'
-    apthelper -qq download-file http://localhost:8080/foo foo4 && msgpass || msgfail
-    testfileequal foo4 'foo'
-    
-    msgtest 'apt-file download-file' 'wrong hash'
-    if ! apthelper -qq download-file http://localhost:8080/foo foo5 MD5Sum:aabbcc 2>&1 2> download.stderr; then
-        msgpass
-    else
-        msgfail
-    fi
-    testfileequal download.stderr 'E: Failed to fetch http://localhost:8080/foo  Hash Sum mismatch
-
-E: Download Failed'
-    testfileequal foo5.FAILED 'foo'
+    testsuccess --nomsg apthelper download-file "${1}/foo" './downloaded/foo4'
+    testfileequal ./downloaded/foo4 'foo'
+
+    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
+   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'
+
+    msgtest 'apt-file download-file' 'sha256 sha1'
+    testsuccess --nomsg apthelper download-file "${1}/foo" './downloaded/foo8' 'SHA256:b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c' \
+	    "${1}/foo2" './downloaded/foo7' 'SHA1:e242ed3bffccdf271b7fbaf34ed72d089537b42f'
+    testfileequal './downloaded/foo8' 'foo'
+    testfileequal './downloaded/foo7' 'bar'
+
+    msgtest 'apt-file download-file' 'md5sum sha1'
+    testsuccess --nomsg apthelper download-file "${1}/foo" './downloaded/foo9' 'MD5Sum:d3b07384d113edec49eaa6238ad5ff00' \
+	    "${1}/foo2" './downloaded/foo10' 'SHA1:e242ed3bffccdf271b7fbaf34ed72d089537b42f'
+    testfileequal './downloaded/foo9' 'foo'
+    testfileequal './downloaded/foo10' 'bar'
 }
 
 test_apt_helper_detect_proxy() {
     # no proxy
-    testequal "Using proxy '' for URL 'http://example.com/'" apthelper auto-detect-proxy http://example.com/
+    testsuccessequal "Using proxy '' for URL 'http://example.com/'" apthelper auto-detect-proxy http://example.com/
 
 
     # http auto detect proxy script
@@ -52,8 +83,8 @@ echo "http://some-proxy"
 EOF
     chmod 755 apt-proxy-detect
     echo "Acquire::http::Proxy-Auto-Detect \"$(pwd)/apt-proxy-detect\";" > rootdir/etc/apt/apt.conf.d/02proxy-detect
-    
-    testequal "Using proxy 'http://some-proxy' for URL 'http://www.example.com/'" apthelper auto-detect-proxy http://www.example.com
+
+    testsuccessequal "Using proxy 'http://some-proxy' for URL 'http://www.example.com/'" apthelper auto-detect-proxy http://www.example.com
 
 
     # https auto detect proxy script
@@ -63,13 +94,20 @@ echo "https://https-proxy"
 EOF
     chmod 755 apt-proxy-detect
     echo "Acquire::https::Proxy-Auto-Detect \"$(pwd)/apt-proxy-detect\";" > rootdir/etc/apt/apt.conf.d/02proxy-detect
-    
-    testequal "Using proxy 'https://https-proxy' for URL 'https://ssl.example.com/'" apthelper auto-detect-proxy https://ssl.example.com 
-
 
-    
+    testsuccessequal "Using proxy 'https://https-proxy' for URL 'https://ssl.example.com/'" apthelper auto-detect-proxy https://ssl.example.com
 }
 
-test_apt_helper_download
+test_apt_helper_download "http://localhost:${APTHTTPPORT}"
+test_apt_helper_download "https://localhost:${APTHTTPSPORT}"
 test_apt_helper_detect_proxy
 
+# test failure modes
+testfailureequal 'E: Invalid operation download' apthelper download
+testfailureequal 'E: Must specify at least one pair url/filename' apthelper download-file
+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 -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}"