improve partial/ cleanup in abort and failure cases

[apt.git] / test / integration / test-bug-591882-conkeror

diff --git a/test/integration/test-bug-591882-conkeror b/test/integration/test-bug-591882-conkeror
index b1dbb3a0a539fbc423103a8e47f935f2bf3e59f0..b71d4d5fde5647b896e49914f7605685c0fc11f0 100755 (executable)
--- a/test/integration/test-bug-591882-conkeror
+++ b/test/integration/test-bug-591882-conkeror
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-local TESTDIR=$(readlink -f $(dirname $0))
+TESTDIR=$(readlink -f $(dirname $0))
 . $TESTDIR/framework
 setupenvironment
 configarchitecture "i386"
@@ -9,6 +9,7 @@ setupaptarchive
 
 UPGRADEFAIL="Reading package lists...
 Building dependency tree...
+Calculating upgrade...
 The following packages will be REMOVED:
   conkeror libdatrie0 libkrb53 libxcb-xlib0 xulrunner-1.9
 The following NEW packages will be installed:
@@ -34,12 +35,13 @@ The following packages will be upgraded:
   perl-base perl-modules readline-common sed ttf-dejavu-core ucf whiptail
   x11-common zlib1g
 87 upgraded, 26 newly installed, 5 to remove and 0 not upgraded.
-Need to get 0B/54.4MB of archives.
-After this operation, 12.4MB of additional disk space will be used.
+Need to get 0 B/54.4 MB of archives.
+After this operation, 12.4 MB of additional disk space will be used.
 E: Trivial Only specified but this is not a trivial operation."
 
 UPGRADESUCCESS="Reading package lists...
 Building dependency tree...
+Calculating upgrade...
 The following packages will be REMOVED:
   libdatrie0 libkrb53 libxcb-xlib0 xulrunner-1.9
 The following NEW packages will be installed:
@@ -66,10 +68,10 @@ The following packages will be upgraded:
   perl-base perl-modules readline-common sed ttf-dejavu-core ucf whiptail
   x11-common zlib1g
 88 upgraded, 30 newly installed, 4 to remove and 0 not upgraded.
-Need to get 0B/62.9MB of archives.
-After this operation, 36.0MB of additional disk space will be used.
+Need to get 0 B/62.9 MB of archives.
+After this operation, 36.0 MB of additional disk space will be used.
 E: Trivial Only specified but this is not a trivial operation."
 
 # Test that the old behavior can be restored with the option
-testequal "$UPGRADEFAIL" aptget dist-upgrade --trivial-only -o pkgProblemResolver::FixByInstall=0
-testequal "$UPGRADESUCCESS" aptget dist-upgrade --trivial-only #-o pkgProblemResolver::FixByInstall=0
+testfailureequal "$UPGRADEFAIL" aptget dist-upgrade --trivial-only -o pkgProblemResolver::FixByInstall=0
+testfailureequal "$UPGRADESUCCESS" aptget dist-upgrade --trivial-only #-o pkgProblemResolver::FixByInstall=0