eipp: add Allow-Temporary-Remove-of-Essentials

[apt.git] / test / integration / test-prefer-higher-priority-providers

diff --git a/test/integration/test-prefer-higher-priority-providers b/test/integration/test-prefer-higher-priority-providers
index 85a302fb1a64e2ed106374e4991e2fa809d9f9b4..7c3f323742facb62ff1c41ba608d59a4f0d1f202 100755 (executable)
--- a/test/integration/test-prefer-higher-priority-providers
+++ b/test/integration/test-prefer-higher-priority-providers
@@ -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 'native'
 
 setupenvironment
 configarchitecture 'native'
 


@@ -15,7 +15,7 @@ setupaptarchive
 
 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:
   awesome foo
   foo
 The following NEW packages will be installed:
   awesome foo


@@ -39,7 +39,7 @@ testsuccessequal "Reading package lists...
 Building dependency tree...
 Package 'bar' is not installed, so not removed
 Package 'baz' is not installed, so not removed
 Building dependency tree...
 Package 'bar' is not installed, so not removed
 Package 'baz' is not installed, so not removed

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

   foo
 The following NEW packages will be installed:
   awesome foo
   foo
 The following NEW packages will be installed:
   awesome foo


@@ -52,7 +52,7 @@ Conf awesome (1 unstable [all])" aptget install awesome bar- baz- -s
 testsuccessequal "Reading package lists...
 Building dependency tree...
 Package 'foo' is not installed, so not removed
 testsuccessequal "Reading package lists...
 Building dependency tree...
 Package 'foo' is not installed, so not removed

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

   bar
 The following NEW packages will be installed:
   awesome bar
   bar
 The following NEW packages will be installed:
   awesome bar


@@ -66,7 +66,7 @@ testsuccessequal "Reading package lists...
 Building dependency tree...
 Package 'foo' is not installed, so not removed
 Package 'baz' is not installed, so not removed
 Building dependency tree...
 Package 'foo' is not installed, so not removed
 Package 'baz' is not installed, so not removed

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

   bar
 The following NEW packages will be installed:
   awesome bar
   bar
 The following NEW packages will be installed:
   awesome bar


@@ -80,7 +80,7 @@ testsuccessequal "Reading package lists...
 Building dependency tree...
 Package 'foo' is not installed, so not removed
 Package 'bar' is not installed, so not removed
 Building dependency tree...
 Package 'foo' is not installed, so not removed
 Package 'bar' is not installed, so not removed

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

   baz
 The following NEW packages will be installed:
   awesome baz
   baz
 The following NEW packages will be installed:
   awesome baz