fix testcase expecting incorrect remove log from dpkg

[apt.git] / test / integration / test-xorg-break-providers

diff --git a/test/integration/test-xorg-break-providers b/test/integration/test-xorg-break-providers
index 139d2c915326fef9649f0375010f1787bec4a234..59b564a02a295f5dba4f79a34e54e1d6f708235d 100755 (executable)
--- a/test/integration/test-xorg-break-providers
+++ b/test/integration/test-xorg-break-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 "i386"
 setupaptarchive
 setupenvironment
 configarchitecture "i386"
 setupaptarchive


@@ -13,9 +13,9 @@ setupaptarchive
 # The test ensures that only -intel will be upgraded
 # (together with -core of course) and -vesa not touched.
 
 # The test ensures that only -intel will be upgraded
 # (together with -core of course) and -vesa not touched.
 

-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...

 Building dependency tree...
 Building dependency tree...

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

   xserver-xorg-video-intel
 The following packages will be upgraded:
   xserver-xorg-core xserver-xorg-video-intel
   xserver-xorg-video-intel
 The following packages will be upgraded:
   xserver-xorg-core xserver-xorg-video-intel


@@ -24,8 +24,9 @@ Need to get 0 B/2992 kB of archives.
 After this operation, 24.6 kB of additional disk space will be used.
 E: Trivial Only specified but this is not a trivial operation.' aptget install xserver-xorg-core --trivial-only
 
 After this operation, 24.6 kB of additional disk space will be used.
 E: Trivial Only specified but this is not a trivial operation.' aptget install xserver-xorg-core --trivial-only
 

-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...

 Building dependency tree...
 Building dependency tree...

+Calculating upgrade...

 The following packages will be upgraded:
   xserver-xorg-core xserver-xorg-video-intel
 2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 The following packages will be upgraded:
   xserver-xorg-core xserver-xorg-video-intel
 2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.


@@ -33,8 +34,9 @@ Need to get 0 B/2992 kB of archives.
 After this operation, 24.6 kB of additional disk space will be used.
 E: Trivial Only specified but this is not a trivial operation.' aptget upgrade --trivial-only
 
 After this operation, 24.6 kB of additional disk space will be used.
 E: Trivial Only specified but this is not a trivial operation.' aptget upgrade --trivial-only
 

-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...

 Building dependency tree...
 Building dependency tree...

+Calculating upgrade...

 The following packages will be upgraded:
   xserver-xorg-core xserver-xorg-video-intel
 2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 The following packages will be upgraded:
   xserver-xorg-core xserver-xorg-video-intel
 2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.