test-apt-cdrom: Fix for gnupg 2.1.15

[apt.git] / test / integration / test-parse-all-archs-into-cache

diff --git a/test/integration/test-parse-all-archs-into-cache b/test/integration/test-parse-all-archs-into-cache
index f61862912ede9728e175d75ed15332ffb93ae9d6..65222f0fe3c415e1c9ac2fc0f75c464e998c137c 100755 (executable)
--- a/test/integration/test-parse-all-archs-into-cache
+++ b/test/integration/test-parse-all-archs-into-cache
@@ -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'
 
@@ -34,7 +34,7 @@ Building dependency tree...' aptget check -s
 
 testsuccessequal 'Reading package lists...
 Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
   libfoo1
 The following packages will be REMOVED:
   foo:amd64
@@ -47,9 +47,11 @@ Inst foo (1 unstable [i386])
 Conf libfoo1 (1 unstable [i386])
 Conf foo (1 unstable [i386])' aptget install foo -s
 
-testsuccessequal 'Reading package lists...
+testsuccessequal "Reading package lists...
 Building dependency tree...
-The following extra packages will be installed:
+Selected version '2' (experimental [i386]) for 'foo'
+Selected version '2' (experimental [i386]) for 'libfoo1' because of 'foo'
+The following additional packages will be installed:
   libfoo1
 The following packages will be REMOVED:
   foo:amd64 libfoo1:amd64
@@ -61,11 +63,11 @@ Remv libfoo1:amd64 [1]
 Inst libfoo1 (2 experimental [i386])
 Inst foo (2 experimental [i386])
 Conf libfoo1 (2 experimental [i386])
-Conf foo (2 experimental [i386])' aptget install foo/experimental -s
+Conf foo (2 experimental [i386])" aptget install foo/experimental -s
 
 testsuccessequal 'Reading package lists...
 Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
   foo libfoo1
 The following packages will be REMOVED:
   foo:amd64