prepare-release: Use equivs and gdebi-core for travis deps

[apt.git] / test / integration / test-bug-717891-abolute-uris-for-proxies

diff --git a/test/integration/test-bug-717891-abolute-uris-for-proxies b/test/integration/test-bug-717891-abolute-uris-for-proxies
index e9c38492ed33ad7b0df311d7c5f627f04fae0bd0..ed9b9a5555d9799bd592606545b978caff7f98a1 100755 (executable)
--- a/test/integration/test-bug-717891-abolute-uris-for-proxies
+++ b/test/integration/test-bug-717891-abolute-uris-for-proxies
@@ -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 'amd64'
 
 setupenvironment
 configarchitecture 'amd64'
 


@@ -12,14 +12,14 @@ setupaptarchive
 changetowebserver --request-absolute='uri'
 
 msgtest 'Check that absolute paths are' 'not accepted'
 changetowebserver --request-absolute='uri'
 
 msgtest 'Check that absolute paths are' 'not accepted'

-aptget update >/dev/null 2>&1 && msgfail || msgpass
+testfailure --nomsg aptget update --allow-insecure-repositories

 
 

-echo 'Acquire::http::Proxy "http://localhost:8080";' > rootdir/etc/apt/apt.conf.d/99proxy
+echo "Acquire::http::Proxy \"http://localhost:${APTHTTPPORT}\";" > rootdir/etc/apt/apt.conf.d/99proxy

 
 msgtest 'Check that requests to proxies are' 'absolute uris'
 
 msgtest 'Check that requests to proxies are' 'absolute uris'

-aptget update >/dev/null 2>&1 && msgpass || msgfail
+testsuccess --nomsg aptget update

 
 

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following NEW packages will be installed:
   unrelated
 Building dependency tree...
 The following NEW packages will be installed:
   unrelated