diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-10-14 14:49:47 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-10-14 14:49:47 +0200 |
| commit | 58d0598ad6f1c514bf7d89fdea676a697f0d9388 (patch) | |
| tree | eade3a15056c5dd70ac0da1953186065c7441c7b /test/integration/test-bug-591882-conkeror | |
| parent | 2c53e7d1a82e2bfe44151ac9d1ac2043fca09efa (diff) | |
| parent | 44dc669e08353716da835608ea54563b4c8c32bb (diff) | |
merged from the debian-sid branch
Diffstat (limited to 'test/integration/test-bug-591882-conkeror')
| -rwxr-xr-x | test/integration/test-bug-591882-conkeror | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/integration/test-bug-591882-conkeror b/test/integration/test-bug-591882-conkeror index b1dbb3a0a..e1c0b42d1 100755 --- 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" @@ -34,8 +34,8 @@ 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... @@ -66,8 +66,8 @@ 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 |