test-apt-cdrom: Fix for gnupg 2.1.15

[apt.git] / test / integration / test-apt-cli-show

diff --git a/test/integration/test-apt-cli-show b/test/integration/test-apt-cli-show
index 5f4ef1b48c7237e9e9acebf8b8aa23974c864edf..754b3aa5fbc389bc4ab2cd74a10ee62244f769a6 100755 (executable)
--- a/test/integration/test-apt-cli-show
+++ b/test/integration/test-apt-cli-show
@@ -1,21 +1,16 @@
 #!/bin/sh
 set -e
 
 #!/bin/sh
 set -e
 

-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"

 
 setupenvironment
 
 setupenvironment

-configarchitecture "i386"
+configarchitecture 'i386' 'amd64'

 
 

-if [ ! -x ${BUILDDIRECTORY}/apt ]; then
-    msgmsg "No ${BUILDDIRECTORY}/apt"
-    msgskip 
-    exit 0
-fi
-
-DESCR='Some description 
+DESCR='Some description

  That has multiple lines'
 insertpackage 'unstable' 'foo' 'all' '1.0' '' '' "$DESCR"
  That has multiple lines'
 insertpackage 'unstable' 'foo' 'all' '1.0' '' '' "$DESCR"

+insertpackage 'unstable' 'bar' 'i386,amd64' '1' '' '' "$DESCR"

 insertinstalledpackage 'foo' 'all' '1.0'
 
 setupaptarchive
 insertinstalledpackage 'foo' 'all' '1.0'
 
 setupaptarchive


@@ -32,10 +27,32 @@ Maintainer: Joe Sixpack <joe@example.org>
 Installed-Size: 43.0 kB
 Download-Size: unknown
 APT-Manual-Installed: yes
 Installed-Size: 43.0 kB
 Download-Size: unknown
 APT-Manual-Installed: yes

-APT-Sources: file:$APTARCHIVE unstable/main i386 Packages
-Description: Some description 
+APT-Sources: file:$APTARCHIVE unstable/main all Packages
+Description: Some description

  That has multiple lines
 " apt show foo
  That has multiple lines
 " apt show foo

+testsuccessequal "Package: bar
+Version: 1
+Priority: optional
+Section: other
+Maintainer: Joe Sixpack <joe@example.org>
+Installed-Size: 43.0 kB
+Download-Size: unknown
+APT-Sources: file:$APTARCHIVE unstable/main i386 Packages
+Description: Some description
+ That has multiple lines
+" apt show bar
+testsuccessequal "Package: bar:amd64
+Version: 1
+Priority: optional
+Section: other
+Maintainer: Joe Sixpack <joe@example.org>
+Installed-Size: 43.0 kB
+Download-Size: unknown
+APT-Sources: file:$APTARCHIVE unstable/main amd64 Packages
+Description: Some description
+ That has multiple lines
+" apt show bar:amd64

 
 # this is the default, but disabled by the testcases
 testsuccess apt show foo -o Apt::Cmd::Disable-Script-Warning=0
 
 # this is the default, but disabled by the testcases
 testsuccess apt show foo -o Apt::Cmd::Disable-Script-Warning=0