fix the testcases which were broken by the new space between number and unit

diff --git a/test/integration/test-bug-591882-conkeror b/test/integration/test-bug-591882-conkeror
index b1dbb3a..27a217b 100755 (executable)
--- a/test/integration/test-bug-591882-conkeror
+++ b/test/integration/test-bug-591882-conkeror
@@ -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

diff --git a/test/integration/test-bug-595691-empty-and-broken-archive-files b/test/integration/test-bug-595691-empty-and-broken-archive-files
index 2340737..d982a49 100755 (executable)
--- a/test/integration/test-bug-595691-empty-and-broken-archive-files
+++ b/test/integration/test-bug-595691-empty-and-broken-archive-files
@@ -11,7 +11,7 @@ setupflataptarchive
 
 testaptgetupdate() {
        aptget update 2>> testaptgetupdate.diff >> testaptgetupdate.diff || true
-       sed -i -e '/^Fetched / d' -e 's#\[[0-9]*[kMGTPY]*B\]#\[\]#' testaptgetupdate.diff
+       sed -i -e '/^Fetched / d' -e 's#\[[0-9]* [kMGTPY]*B\]#\[\]#' testaptgetupdate.diff
        GIVEN="$1"
        shift
        msgtest "Test for correctness of" "apt-get update with $*"

diff --git a/test/integration/test-ubuntu-bug-614993 b/test/integration/test-ubuntu-bug-614993
index f54909b..d70c65b 100755 (executable)
--- a/test/integration/test-ubuntu-bug-614993
+++ b/test/integration/test-ubuntu-bug-614993
@@ -52,8 +52,8 @@ The following packages will be upgraded:
   xserver-xorg-video-tseng xserver-xorg-video-vesa xserver-xorg-video-vmware
   xserver-xorg-video-voodoo
 41 upgraded, 5 newly installed, 1 to remove and 3 not upgraded.
-Need to get 0B/5505kB of archives.
-After this operation, 2294kB disk space will be freed.
+Need to get 0 B/5505 kB of archives.
+After this operation, 2294 kB disk space will be freed.
 E: Trivial Only specified but this is not a trivial operation."
 testequal "$UPGRADE" aptget install xserver-xorg --trivial-only