apt-key: warn instead of fail on unreadable keyrings

[apt.git] / test / integration / test-bug-604401-files-are-directories

diff --git a/test/integration/test-bug-604401-files-are-directories b/test/integration/test-bug-604401-files-are-directories
index fe0ccc7837e04fbb12fd7b8d41a4235a2bf7ee3d..4261d544ddef0e854f550d8d7176facb93db1a06 100755 (executable)
--- a/test/integration/test-bug-604401-files-are-directories
+++ b/test/integration/test-bug-604401-files-are-directories
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
 setupenvironment
 configarchitecture "i386"
 setupaptarchive
@@ -17,7 +17,7 @@ rmdir rootdir/etc/apt/apt.conf
 msgtest "Good link instead of a file as apt.conf ignored"
 echo 'Test::APT::Link "good";' > rootdir/etc/apt/good-link.conf
 ln -s rootdir/etc/apt/good-link.conf rootdir/etc/apt/apt.conf
-test -n "$(aptconfig shell TestLink 'Test::APT::Link')" && msgfail || msgpass
+testempty aptconfig shell TestLink 'Test::APT::Link'
 rm rootdir/etc/apt/apt.conf
 
 msgtest "Broken link instead of a file as apt.conf ignored"
@@ -36,12 +36,12 @@ rmdir rootdir/etc/apt/sources.list
 msgtest "Good link instead of a file as sources.list ignored"
 echo 'deb file:///tmp/debian sid main' > rootdir/etc/apt/good-link.list
 ln -s rootdir/etc/apt/good-link.list rootdir/etc/apt/sources.list
-test -n "$(aptget update --print-uris)" && msgfail || msgpass
+testempty aptget update --print-uris
 rm rootdir/etc/apt/sources.list
 
 msgtest "Broken link instead of a file as sources.list ignored"
 ln -s /tmp/doesnt-exist rootdir/etc/apt/sources.list
-test -n "$(aptget update --print-uris)" && msgfail || msgpass
+testempty aptget update --print-uris
 rm rootdir/etc/apt/sources.list
 
 
@@ -57,7 +57,8 @@ echo 'Package: apt
 Pin: release a=now
 Pin-Value: 1000' > rootdir/etc/apt/good-link.pref
 ln -s rootdir/etc/apt/good-link.pref rootdir/etc/apt/preferences
-test -n "$(aptcache policy | grep '1000 ')" && msgfail || msgpass
+testsuccess aptcache policy
+testfailure grep '1000 ' rootdir/tmp/testsucess.output
 rm rootdir/etc/apt/preferences
 
 msgtest "Broken link instead of a file as preferences ignored"