tests: support spaces in path and TMPDIR

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

diff --git a/test/integration/test-apt-helper b/test/integration/test-apt-helper
index b78201ef0fcb4f0454d335093eedef4102fb97a7..b2347ddcf152ee5bd013fe91d59c9f3482d69e34 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'


@@ -95,6 +95,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}"