report warnings&errors consistently in edit-sources

[apt.git] / test / integration / test-unpack-different-version-unpacked

diff --git a/test/integration/test-unpack-different-version-unpacked b/test/integration/test-unpack-different-version-unpacked
index 952f6e6b201f1dd6b73cd03adf350365f0aee700..bcb483639ee685b3adaea8634d2de59fc6276582 100755 (executable)
--- a/test/integration/test-unpack-different-version-unpacked
+++ b/test/integration/test-unpack-different-version-unpacked
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
 setupenvironment
 configarchitecture 'amd64' 'i386'
 
@@ -19,7 +19,7 @@ cleanstatus() {
 
 #FIXME: the reported version is wrong, it should be 1, not 2
 insertinstalledpackage 'libqtcore4' 'i386,amd64' '1' 'Multi-Arch: same' '' 'install ok unpacked'
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
 Building dependency tree...
 0 upgraded, 0 newly installed, 0 to remove and 2 not upgraded.
 2 not fully installed or removed.
@@ -29,10 +29,10 @@ Conf libqtcore4:i386 (2 unstable [i386])' aptget install -s -f
 cleanstatus
 insertinstalledpackage 'libqtcore4' 'amd64' '2' 'Multi-Arch: same' '' 'install ok unpacked'
 insertinstalledpackage 'libqtcore4' 'i386' '1' 'Multi-Arch: same' '' 'install ok unpacked'
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
 Building dependency tree...
 Correcting dependencies... Done
-The following extra packages will be installed:
+The following additional packages will be installed:
   libqtcore4:i386
 The following packages will be upgraded:
   libqtcore4:i386
@@ -45,10 +45,10 @@ Conf libqtcore4 (2 unstable [amd64])' aptget install -s -f
 cleanstatus
 insertinstalledpackage 'libqtcore4' 'i386' '2' 'Multi-Arch: same' '' 'install ok unpacked'
 insertinstalledpackage 'libqtcore4' 'amd64' '1' 'Multi-Arch: same' '' 'install ok unpacked'
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
 Building dependency tree...
 Correcting dependencies... Done
-The following extra packages will be installed:
+The following additional packages will be installed:
   libqtcore4
 The following packages will be upgraded:
   libqtcore4
@@ -61,10 +61,10 @@ Conf libqtcore4:i386 (2 unstable [i386])' aptget install -s -f
 cleanstatus
 insertinstalledpackage 'libqtcore4' 'amd64' '2' 'Multi-Arch: same' '' 'install ok unpacked'
 insertinstalledpackage 'libqtcore4' 'i386' '1' 'Multi-Arch: same'
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
 Building dependency tree...
 Correcting dependencies... Done
-The following extra packages will be installed:
+The following additional packages will be installed:
   libqtcore4:i386
 The following packages will be upgraded:
   libqtcore4:i386
@@ -77,10 +77,10 @@ Conf libqtcore4 (2 unstable [amd64])' aptget install -s -f
 cleanstatus
 insertinstalledpackage 'libqtcore4' 'i386' '2' 'Multi-Arch: same' '' 'install ok unpacked'
 insertinstalledpackage 'libqtcore4' 'amd64' '1' 'Multi-Arch: same'
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
 Building dependency tree...
 Correcting dependencies... Done
-The following extra packages will be installed:
+The following additional packages will be installed:
   libqtcore4
 The following packages will be upgraded:
   libqtcore4
@@ -93,10 +93,10 @@ Conf libqtcore4:i386 (2 unstable [i386])' aptget install -s -f
 cleanstatus
 insertinstalledpackage 'libqtcore4' 'amd64' '2' 'Multi-Arch: same'
 insertinstalledpackage 'libqtcore4' 'i386' '1' 'Multi-Arch: same' '' 'install ok unpacked'
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
 Building dependency tree...
 Correcting dependencies... Done
-The following extra packages will be installed:
+The following additional packages will be installed:
   libqtcore4:i386
 The following packages will be upgraded:
   libqtcore4:i386
@@ -108,10 +108,10 @@ Conf libqtcore4:i386 (2 unstable [i386])' aptget install -s -f
 cleanstatus
 insertinstalledpackage 'libqtcore4' 'i386' '2' 'Multi-Arch: same'
 insertinstalledpackage 'libqtcore4' 'amd64' '1' 'Multi-Arch: same' '' 'install ok unpacked'
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
 Building dependency tree...
 Correcting dependencies... Done
-The following extra packages will be installed:
+The following additional packages will be installed:
   libqtcore4
 The following packages will be upgraded:
   libqtcore4