add apt-key support for armored GPG key files (*.asc)

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

diff --git a/test/integration/test-cachecontainer-architecture-specification b/test/integration/test-cachecontainer-architecture-specification
index 47abfb5b0ec1b55b44cadcee04052f184c453d8c..65574685e629c482a7ce1281a66d7a291d2d394d 100755 (executable)
--- a/test/integration/test-cachecontainer-architecture-specification
+++ b/test/integration/test-cachecontainer-architecture-specification
@@ -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 'amd64' 'armel'
 
 setupenvironment
 configarchitecture 'amd64' 'armel'
 


@@ -12,31 +12,31 @@ insertpackage 'unstable' 'foo' 'all' '1'
 
 setupaptarchive
 
 
 setupaptarchive
 

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following NEW packages will be installed:
   libsame
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 Inst libsame (1 unstable [amd64])
 Conf libsame (1 unstable [amd64])' aptget -s install libsame
 Building dependency tree...
 The following NEW packages will be installed:
   libsame
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 Inst libsame (1 unstable [amd64])
 Conf libsame (1 unstable [amd64])' aptget -s install libsame

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following NEW packages will be installed:
   libsame:armel
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 Inst libsame:armel (1 unstable [armel])
 Conf libsame:armel (1 unstable [armel])' aptget -s install libsame:armel
 Building dependency tree...
 The following NEW packages will be installed:
   libsame:armel
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 Inst libsame:armel (1 unstable [armel])
 Conf libsame:armel (1 unstable [armel])' aptget -s install libsame:armel

-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...

 Building dependency tree...
 Building dependency tree...

-E: Unable to locate package libsame' aptget -s install libsame:armhf
-testequal 'Reading package lists...
+E: Unable to locate package libsame:armhf' aptget -s install libsame:armhf
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following NEW packages will be installed:
   libsame
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 Inst libsame (1 unstable [amd64])
 Conf libsame (1 unstable [amd64])' aptget -s install libsame:amd64
 Building dependency tree...
 The following NEW packages will be installed:
   libsame
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 Inst libsame (1 unstable [amd64])
 Conf libsame (1 unstable [amd64])' aptget -s install libsame:amd64

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following NEW packages will be installed:
   libsame libsame:armel
 Building dependency tree...
 The following NEW packages will be installed:
   libsame libsame:armel


@@ -45,7 +45,7 @@ Inst libsame (1 unstable [amd64])
 Inst libsame:armel (1 unstable [armel])
 Conf libsame (1 unstable [amd64])
 Conf libsame:armel (1 unstable [armel])' aptget -s install libsame:armel libsame:amd64
 Inst libsame:armel (1 unstable [armel])
 Conf libsame (1 unstable [amd64])
 Conf libsame:armel (1 unstable [armel])' aptget -s install libsame:armel libsame:amd64

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following NEW packages will be installed:
   libsame libsame:armel
 Building dependency tree...
 The following NEW packages will be installed:
   libsame libsame:armel


@@ -54,14 +54,14 @@ Inst libsame (1 unstable [amd64])
 Inst libsame:armel (1 unstable [armel])
 Conf libsame (1 unstable [amd64])
 Conf libsame:armel (1 unstable [armel])' aptget -s install libsame:*
 Inst libsame:armel (1 unstable [armel])
 Conf libsame (1 unstable [amd64])
 Conf libsame:armel (1 unstable [armel])' aptget -s install libsame:*

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following NEW packages will be installed:
   libsame
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 Inst libsame (1 unstable [amd64])
 Conf libsame (1 unstable [amd64])' aptget -s install libsame:any
 Building dependency tree...
 The following NEW packages will be installed:
   libsame
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 Inst libsame (1 unstable [amd64])
 Conf libsame (1 unstable [amd64])' aptget -s install libsame:any

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following NEW packages will be installed:
   libsame libsame:armel
 Building dependency tree...
 The following NEW packages will be installed:
   libsame libsame:armel


@@ -70,14 +70,14 @@ Inst libsame (1 unstable [amd64])
 Inst libsame:armel (1 unstable [armel])
 Conf libsame (1 unstable [amd64])
 Conf libsame:armel (1 unstable [armel])' aptget -s install libsame:a*
 Inst libsame:armel (1 unstable [armel])
 Conf libsame (1 unstable [amd64])
 Conf libsame:armel (1 unstable [armel])' aptget -s install libsame:a*

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following NEW packages will be installed:
   libsame
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 Inst libsame (1 unstable [amd64])
 Conf libsame (1 unstable [amd64])' aptget -s install libsame:linux-any
 Building dependency tree...
 The following NEW packages will be installed:
   libsame
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 Inst libsame (1 unstable [amd64])
 Conf libsame (1 unstable [amd64])' aptget -s install libsame:linux-any

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following NEW packages will be installed:
   libsame libsame:armel
 Building dependency tree...
 The following NEW packages will be installed:
   libsame libsame:armel


@@ -86,35 +86,35 @@ Inst libsame (1 unstable [amd64])
 Inst libsame:armel (1 unstable [armel])
 Conf libsame (1 unstable [amd64])
 Conf libsame:armel (1 unstable [armel])' aptget -s install libsame:linux-*
 Inst libsame:armel (1 unstable [armel])
 Conf libsame (1 unstable [amd64])
 Conf libsame:armel (1 unstable [armel])' aptget -s install libsame:linux-*

-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...

 Building dependency tree...
 Building dependency tree...

-E: Unable to locate package libsame' aptget -s install libsame:windows-any
+E: Unable to locate package libsame:windows-any' aptget -s install libsame:windows-any

 
 

-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...

 Building dependency tree...
 Building dependency tree...

-E: Unable to locate package foo' aptget -s install foo:armel
-testequal 'Reading package lists...
+E: Unable to locate package foo:armel' aptget -s install foo:armel
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following NEW packages will be installed:
   foo
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 Inst foo (1 unstable [all])
 Conf foo (1 unstable [all])' aptget -s install foo
 Building dependency tree...
 The following NEW packages will be installed:
   foo
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 Inst foo (1 unstable [all])
 Conf foo (1 unstable [all])' aptget -s install foo

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following NEW packages will be installed:
   foo
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 Inst foo (1 unstable [all])
 Conf foo (1 unstable [all])' aptget -s install foo:all
 Building dependency tree...
 The following NEW packages will be installed:
   foo
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 Inst foo (1 unstable [all])
 Conf foo (1 unstable [all])' aptget -s install foo:all

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following NEW packages will be installed:
   foo
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 Inst foo (1 unstable [all])
 Conf foo (1 unstable [all])' aptget -s install foo:amd64
 Building dependency tree...
 The following NEW packages will be installed:
   foo
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 Inst foo (1 unstable [all])
 Conf foo (1 unstable [all])' aptget -s install foo:amd64

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 The following NEW packages will be installed:
   foo
 Building dependency tree...
 The following NEW packages will be installed:
   foo