test-apt-cdrom: Fix for gnupg 2.1.15

[apt.git] / test / integration / test-sourceslist-trusted-options

diff --git a/test/integration/test-sourceslist-trusted-options b/test/integration/test-sourceslist-trusted-options
index 86036e2427351fac78d40bb40be9ea121945b804..94de11ef76988aa0e637438c220db01bfb562e5e 100755 (executable)
--- a/test/integration/test-sourceslist-trusted-options
+++ b/test/integration/test-sourceslist-trusted-options
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
 
 setupenvironment
 configarchitecture 'amd64'
@@ -109,7 +109,7 @@ everythingsucceeds -t testing
 msgmsg 'Test with trusted=yes option and good and unsigned sources'
 cp -a rootdir/etc/apt/sources.list.d.bak/* rootdir/etc/apt/sources.list.d/
 sed -i 's#^deb\(-src\)\? #deb\1 [trusted=yes] #' rootdir/etc/apt/sources.list.d/*
-aptgetupdate 'testwarning'
+aptgetupdate
 everythingsucceeds
 everythingsucceeds -t stable
 everythingsucceeds -t testing
@@ -187,7 +187,7 @@ everythingfails -t testing
 msgmsg 'Test with trusted=yes option and unsigned and good sources'
 cp -a rootdir/etc/apt/sources.list.d.bak/* rootdir/etc/apt/sources.list.d/
 sed -i 's#^deb\(-src\)\? #deb\1 [trusted=yes] #' rootdir/etc/apt/sources.list.d/*
-aptgetupdate 'testwarning'
+aptgetupdate
 everythingsucceeds
 everythingsucceeds -t stable
 everythingsucceeds -t testing
@@ -203,7 +203,7 @@ everythingfails -t testing
 msgmsg 'Test conflicting trusted options are refused'
 testsource() {
        echo "$@" > rootdir/etc/apt/sources.list.d/example.list
-       testfailuremsg 'E: Conflicting values set for option Trusted concerning source http://example.org/bad/ unstable
+       testfailuremsg 'E: Conflicting values set for option Trusted regarding source http://example.org/bad/ unstable
 E: The list of sources could not be read.' aptget update --print-uris
 }
 for VAL in 'yes' 'no'; do