tests: support spaces in path and TMPDIR

[apt.git] / test / integration / test-bug-407511-fail-invalid-default-release

diff --git a/test/integration/test-bug-407511-fail-invalid-default-release b/test/integration/test-bug-407511-fail-invalid-default-release
index 7f23a1e82ef85a1f8f3378e8e510d1a9250b4fed..0e1b5ef833d95b6e578e43589b11c34614011acf 100755 (executable)
--- a/test/integration/test-bug-407511-fail-invalid-default-release
+++ b/test/integration/test-bug-407511-fail-invalid-default-release
@@ -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'
 


@@ -35,14 +35,14 @@ setupaptarchive
 
 passdist() {
        msgtest 'Test that target-release is accepted' $1
 
 passdist() {
        msgtest 'Test that target-release is accepted' $1

-       aptget dist-upgrade -t $1 -qq && msgpass || msgfail
+       testsuccess --nomsg aptget dist-upgrade -t $1

        msgtest 'Test that target-release pins with' $1
        aptcache policy -t $1 | grep -q ' 990' && msgpass || msgfail
 }
 
 faildist() {
        msgtest 'Test that target-release is refused' $1
        msgtest 'Test that target-release pins with' $1
        aptcache policy -t $1 | grep -q ' 990' && msgpass || msgfail
 }
 
 faildist() {
        msgtest 'Test that target-release is refused' $1

-       aptget dist-upgrade -t $1 -qq 2> /dev/null && msgfail || msgpass
+       testfailure --nomsg aptget dist-upgrade -t $1

 }
 
 msgtest 'Test that no default-release is active in this test' 'setup'
 }
 
 msgtest 'Test that no default-release is active in this test' 'setup'