X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/fdbe726599ae4dd3d808858356cf3464de94f1e4..4ff5e237d5685be187a75c563b86e80ea3e7cc01:/test/integration/test-bug-612557-garbage-upgrade

diff --git a/test/integration/test-bug-612557-garbage-upgrade b/test/integration/test-bug-612557-garbage-upgrade
index e2ffe615f..d232c4412 100755
--- a/test/integration/test-bug-612557-garbage-upgrade
+++ b/test/integration/test-bug-612557-garbage-upgrade
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
-local TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
 setupenvironment
 configarchitecture "i386"
 
@@ -13,14 +13,14 @@ insertpackage 'unstable' 'libreoffice-common' 'all' '1:3.3.0-2' 'Conflicts: open
 setupaptarchive
 
 touch rootdir/var/lib/apt/extended_states
-aptmark markauto python-uno ure uno-libs3 openoffice.org-common openoffice.org-style-galaxy
+testsuccess aptmark markauto python-uno openoffice.org-common
 #aptmark unmarkauto openoffice.org-emailmerge
-testmarkedauto python-uno ure uno-libs3 openoffice.org-common openoffice.org-style-galaxy
+testmarkedauto python-uno openoffice.org-common
 
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
 Building dependency tree...
 Reading state information...
-The following extra packages will be installed:
+The following additional packages will be installed:
   libreoffice-common
 The following packages will be REMOVED:
   openoffice.org-common openoffice.org-emailmerge
@@ -32,13 +32,13 @@ The following packages will be upgraded:
 After this operation, 53.2 MB disk space will be freed.
 E: Trivial Only specified but this is not a trivial operation.' aptget --trivial-only install python-uno
 
-aptmark markauto openoffice.org-emailmerge
-testmarkedauto python-uno ure uno-libs3 openoffice.org-common openoffice.org-style-galaxy openoffice.org-emailmerge
+testsuccess aptmark markauto openoffice.org-emailmerge
+testmarkedauto python-uno openoffice.org-common openoffice.org-emailmerge
 
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
 Building dependency tree...
 Reading state information...
-The following extra packages will be installed:
+The following additional packages will be installed:
   libreoffice-common
 The following packages will be REMOVED:
   openoffice.org-common openoffice.org-emailmerge
@@ -50,7 +50,7 @@ The following packages will be upgraded:
 After this operation, 53.2 MB disk space will be freed.
 E: Trivial Only specified but this is not a trivial operation.' aptget --trivial-only install python-uno
 
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
 Building dependency tree...
 Reading state information...
 The following packages will be REMOVED: