fix testcase expecting incorrect remove log from dpkg

[apt.git] / test / integration / test-handling-broken-orgroups

diff --git a/test/integration/test-handling-broken-orgroups b/test/integration/test-handling-broken-orgroups
index 149f05fa9989ba8499fb716610748eb044837cbc..564ea8839c4d3f2005597dd410cdd16f52def8d9 100755 (executable)
--- a/test/integration/test-handling-broken-orgroups
+++ b/test/integration/test-handling-broken-orgroups
@@ -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'
 
 setupenvironment
 configarchitecture 'i386'
 


@@ -25,7 +25,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:

   cool
 The following NEW packages will be installed:
   cool coolstuff
   cool
 The following NEW packages will be installed:
   cool coolstuff


@@ -37,7 +37,7 @@ Conf coolstuff (1.0-1 unstable [all])' aptget install coolstuff -s
 
 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:

   stuff
 The following NEW packages will be installed:
   coolstuff2 stuff
   stuff
 The following NEW packages will be installed:
   coolstuff2 stuff


@@ -63,7 +63,7 @@ E: Unable to correct problems, you have held broken packages.' aptget install co
 testsuccessequal 'Reading package lists...
 Building dependency tree...
 Recommended packages:
 testsuccessequal 'Reading package lists...
 Building dependency tree...
 Recommended packages:

-  cool2 stuff2
+  cool2 | stuff2

 The following NEW packages will be installed:
   coolstuff-brokenrec
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 The following NEW packages will be installed:
   coolstuff-brokenrec
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.


@@ -72,7 +72,7 @@ Conf coolstuff-brokenrec (1.0-1 unstable [all])' aptget install coolstuff-broken
 
 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:

   stuff
 The following NEW packages will be installed:
   coolstuff-conflict stuff
   stuff
 The following NEW packages will be installed:
   coolstuff-conflict stuff


@@ -84,7 +84,7 @@ Conf coolstuff-conflict (1.0-1 unstable [all])' aptget install coolstuff-conflic
 
 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:

   extrastuff
 The following NEW packages will be installed:
   coolstuff-provided extrastuff
   extrastuff
 The following NEW packages will be installed:
   coolstuff-provided extrastuff