apt-key: warn instead of fail on unreadable keyrings

[apt.git] / test / integration / test-architecture-specification-parsing

diff --git a/test/integration/test-architecture-specification-parsing b/test/integration/test-architecture-specification-parsing
index d1f6011dea6463c1dc432e4310c317a8b5edf492..23199384e91f523c76b1580935aa49be95e79579 100755 (executable)
--- a/test/integration/test-architecture-specification-parsing
+++ b/test/integration/test-architecture-specification-parsing
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
 setupenvironment
 
 # we need this construct here as it isn't really possible to fake native arch for dpkg-* tools
@@ -26,9 +26,9 @@ insertinstalledpackage 'build-essential' 'all' '11.5' 'Multi-Arch: foreign'
 
 setupaptarchive
 
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
 Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
   foo
 The following NEW packages will be installed:
   foo pkg-arch-foo
@@ -38,7 +38,7 @@ Inst pkg-arch-foo (1.0 stable [${NATIVE}])
 Conf foo (1.0 stable [${NATIVE}])
 Conf pkg-arch-foo (1.0 stable [${NATIVE}])" aptget install pkg-arch-foo -s
 
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
 Building dependency tree...
 The following NEW packages will be installed:
   pkg-arch-no-foo
@@ -46,9 +46,9 @@ The following NEW packages will be installed:
 Inst pkg-arch-no-foo (1.0 stable [${NATIVE}])
 Conf pkg-arch-no-foo (1.0 stable [${NATIVE}])" aptget install pkg-arch-no-foo -s
 
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
 Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
   foo
 The following NEW packages will be installed:
   foo pkg-arch-foo-unrelated-no
@@ -58,9 +58,9 @@ Inst pkg-arch-foo-unrelated-no (1.0 stable [${NATIVE}])
 Conf foo (1.0 stable [${NATIVE}])
 Conf pkg-arch-foo-unrelated-no (1.0 stable [${NATIVE}])" aptget install pkg-arch-foo-unrelated-no -s
 
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
 Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
   foo
 The following NEW packages will be installed:
   foo pkg-arch-foo-unrelated-no2
@@ -70,7 +70,8 @@ Inst pkg-arch-foo-unrelated-no2 (1.0 stable [${NATIVE}])
 Conf foo (1.0 stable [${NATIVE}])
 Conf pkg-arch-foo-unrelated-no2 (1.0 stable [${NATIVE}])" aptget install pkg-arch-foo-unrelated-no2 -s
 
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
+Reading package lists...
 Building dependency tree...
 The following NEW packages will be installed:
   foo
@@ -78,11 +79,14 @@ The following NEW packages will be installed:
 Inst foo (1.0 stable [${NATIVE}])
 Conf foo (1.0 stable [${NATIVE}])" aptget build-dep pkg-arch-foo -s
 
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
+pkg-arch-no-foo has no build depends.
+Reading package lists...
 Building dependency tree...
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget build-dep pkg-arch-no-foo -s
 
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
+Reading package lists...
 Building dependency tree...
 The following NEW packages will be installed:
   foo
@@ -90,7 +94,8 @@ The following NEW packages will be installed:
 Inst foo (1.0 stable [${NATIVE}])
 Conf foo (1.0 stable [${NATIVE}])" aptget build-dep pkg-arch-foo-unrelated-no -s
 
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
+Reading package lists...
 Building dependency tree...
 The following NEW packages will be installed:
   foo
@@ -98,13 +103,15 @@ The following NEW packages will be installed:
 Inst foo (1.0 stable [${NATIVE}])
 Conf foo (1.0 stable [${NATIVE}])" aptget build-dep pkg-arch-foo-unrelated-no2 -s
 
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
+no-depends has no build depends.
+Reading package lists...
 Building dependency tree...
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget build-dep no-depends -s
 
 # this is not really testing APT - more that dpkg is in line with us
 configarchitecture 'amd64' 'armel'
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
 Building dependency tree...
 The following NEW packages will be installed:
   no-depends:armel