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

[apt.git] / test / integration / test-apt-get-install-virtual-pkgs

diff --git a/test/integration/test-apt-get-install-virtual-pkgs b/test/integration/test-apt-get-install-virtual-pkgs
index ca3790f4636196486b2a8fb1d293319a61ac1401..b2fd7499c591c7826e1078280d03b77691a0a722 100755 (executable)
--- a/test/integration/test-apt-get-install-virtual-pkgs
+++ b/test/integration/test-apt-get-install-virtual-pkgs
@@ -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' 'i386'
 
 setupenvironment
 configarchitecture 'amd64' 'i386'
 


@@ -32,7 +32,7 @@ The following NEW packages will be installed:
   foo
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 Inst foo (1 unstable [amd64])
   foo
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 Inst foo (1 unstable [amd64])

-Conf foo (1 unstable [amd64])" aptget install foo-prv -s -q=0
+Conf foo (1 unstable [amd64])" aptget install foo-prv -s

 
 testvirtuals() {
        testfailureequal "Reading package lists...
 
 testvirtuals() {
        testfailureequal "Reading package lists...


@@ -42,7 +42,7 @@ Package $1 is a virtual package provided by:
   $2
 You should explicitly select one to install.
 
   $2
 You should explicitly select one to install.
 

-E: Package '$1' has no installation candidate" aptget install $1 -s -q=0
+E: Package '$1' has no installation candidate" aptget install $1 -s

 }
 
 testvirtuals 'foo-prv1' 'baz1 1' 'foo1 1'
 }
 
 testvirtuals 'foo-prv1' 'baz1 1' 'foo1 1'


@@ -61,4 +61,4 @@ Package foo-prv5 is a virtual package provided by:
   foo5:i386 2 [Not candidate version]
   baz5 1 [Not candidate version]
 
   foo5:i386 2 [Not candidate version]
   baz5 1 [Not candidate version]
 

-E: Package 'foo-prv5' has no installation candidate" aptget install foo-prv5 -s -q=0
+E: Package 'foo-prv5' has no installation candidate" aptget install foo-prv5 -s