show apt-key warnings in apt update

[apt.git] / test / integration / test-ignore-provides-if-versioned-breaks

diff --git a/test/integration/test-ignore-provides-if-versioned-breaks b/test/integration/test-ignore-provides-if-versioned-breaks
index 4d6114637cf10fafa6b9cc745abf8adbd7f9c14c..ebcbecf47862fd27ad5cafa51447be3102f4c581 100755 (executable)
--- a/test/integration/test-ignore-provides-if-versioned-breaks
+++ b/test/integration/test-ignore-provides-if-versioned-breaks
@@ -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 'i386' 'amd64'
 
 setupenvironment
 configarchitecture 'i386' 'amd64'
 


@@ -57,7 +57,7 @@ Conf foo-provider (1.0 unstable [i386])' aptget install foo-provider foo-breaker
 
 testsuccessequal 'Reading package lists...
 Building dependency tree...
 
 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-breaker-3 foo-provider
   foo
 The following NEW packages will be installed:
   foo-breaker-3 foo-provider


@@ -95,7 +95,7 @@ Conf foo-foreign-provider (1.0 unstable [i386])' aptget install foo-foreign-prov
 
 testsuccessequal 'Reading package lists...
 Building dependency tree...
 
 testsuccessequal 'Reading package lists...
 Building dependency tree...

-The following extra packages will be installed:
+The following additional packages will be installed:

   foo-foreign:amd64
 The following NEW packages will be installed:
   foo-foreign-breaker-3 foo-foreign-provider
   foo-foreign:amd64
 The following NEW packages will be installed:
   foo-foreign-breaker-3 foo-foreign-provider


@@ -133,7 +133,7 @@ Conf foo-same-provider (1.0 unstable [i386])' aptget install foo-same-provider f
 
 testsuccessequal 'Reading package lists...
 Building dependency tree...
 
 testsuccessequal 'Reading package lists...
 Building dependency tree...

-The following extra packages will be installed:
+The following additional packages will be installed:

   foo-same foo-same:amd64
 The following NEW packages will be installed:
   foo-same-breaker-3 foo-same-provider
   foo-same foo-same:amd64
 The following NEW packages will be installed:
   foo-same-breaker-3 foo-same-provider


@@ -144,7 +144,7 @@ Inst foo-same [2.0] (4.0 unstable [i386]) [foo-same:i386 on foo-same:amd64] [foo
 Inst foo-same:amd64 [2.0] (4.0 unstable [amd64])
 Inst foo-same-breaker-3 (1.0 unstable [i386])
 Inst foo-same-provider (1.0 unstable [i386])
 Inst foo-same:amd64 [2.0] (4.0 unstable [amd64])
 Inst foo-same-breaker-3 (1.0 unstable [i386])
 Inst foo-same-provider (1.0 unstable [i386])

-Conf foo-same:amd64 (4.0 unstable [amd64])

 Conf foo-same (4.0 unstable [i386])
 Conf foo-same (4.0 unstable [i386])

+Conf foo-same:amd64 (4.0 unstable [amd64])

 Conf foo-same-breaker-3 (1.0 unstable [i386])
 Conf foo-same-provider (1.0 unstable [i386])' aptget install foo-same-provider foo-same-breaker-3 -s
 Conf foo-same-breaker-3 (1.0 unstable [i386])
 Conf foo-same-provider (1.0 unstable [i386])' aptget install foo-same-provider foo-same-breaker-3 -s