Merge remote-tracking branch 'donkult/debian/experimental' into debian/experimental

[apt.git] / test / integration / test-bug-601961-install-info

diff --git a/test/integration/test-bug-601961-install-info b/test/integration/test-bug-601961-install-info
index b91bf36155df7f0b50032c0efacf9be33ea54fc3..806d3f5475fe0275fd93ddce18fdc1b4fdf138da 100755 (executable)
--- a/test/integration/test-bug-601961-install-info
+++ b/test/integration/test-bug-601961-install-info
@@ -1,13 +1,13 @@
 #!/bin/sh
 set -e
 
 #!/bin/sh
 set -e
 

-local TESTDIR=$(readlink -f $(dirname $0))
+TESTDIR=$(readlink -f $(dirname $0))

 . $TESTDIR/framework
 setupenvironment
 configarchitecture "i386"
 setupaptarchive
 
 . $TESTDIR/framework
 setupenvironment
 configarchitecture "i386"
 setupaptarchive
 

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

 Building dependency tree...
 The following packages will be REMOVED:
   findutils
 Building dependency tree...
 The following packages will be REMOVED:
   findutils


@@ -18,7 +18,7 @@ This should NOT be done unless you know exactly what you are doing!
 After this operation, 1745 kB disk space will be freed.
 E: Trivial Only specified but this is not a trivial operation.' aptget remove findutils --trivial-only
 
 After this operation, 1745 kB disk space will be freed.
 E: Trivial Only specified but this is not a trivial operation.' aptget remove findutils --trivial-only
 

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

 Building dependency tree...
 The following packages will be REMOVED:
   install-info
 Building dependency tree...
 The following packages will be REMOVED:
   install-info


@@ -26,7 +26,7 @@ The following packages will be REMOVED:
 After this operation, 262 kB disk space will be freed.
 E: Trivial Only specified but this is not a trivial operation.' aptget remove install-info --trivial-only
 
 After this operation, 262 kB disk space will be freed.
 E: Trivial Only specified but this is not a trivial operation.' aptget remove install-info --trivial-only
 

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

 Building dependency tree...
 The following packages will be REMOVED:
   essentialpkg findutils
 Building dependency tree...
 The following packages will be REMOVED:
   essentialpkg findutils