X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/2a884c612b10b27f4be2cc6dd689bfe448d9361a..8d1cb6da6e21302c654da3f09de3975af7e4a11f:/test/integration/test-bug-680041-apt-mark-holds-correctly?ds=sidebyside

diff --git a/test/integration/test-bug-680041-apt-mark-holds-correctly b/test/integration/test-bug-680041-apt-mark-holds-correctly
index 3f40c23dc..49bb21bc1 100755
--- a/test/integration/test-bug-680041-apt-mark-holds-correctly
+++ b/test/integration/test-bug-680041-apt-mark-holds-correctly
@@ -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'
 
@@ -17,7 +17,7 @@ setupaptarchive
 runtests() {
 	testempty aptmark showhold
 
-	testequal 'Reading package lists...
+	testfailureequal 'Reading package lists...
 Building dependency tree...
 Calculating upgrade...
 The following packages will be upgraded:
@@ -26,10 +26,10 @@ The following packages will be upgraded:
 After this operation, 0 B of additional disk space will be used.
 E: Trivial Only specified but this is not a trivial operation.' aptget dist-upgrade --trivial-only
 
-	testequal 'pkgarch set on hold.' aptmark hold pkgarch
-	testequal 'pkgarch' aptmark showhold
+	testsuccessequal 'pkgarch set on hold.' aptmark hold pkgarch
+	testsuccessequal 'pkgarch' aptmark showhold
 
-	testequal 'Reading package lists...
+	testfailureequal 'Reading package lists...
 Building dependency tree...
 Calculating upgrade...
 The following packages have been kept back:
@@ -40,10 +40,10 @@ The following packages will be upgraded:
 After this operation, 0 B of additional disk space will be used.
 E: Trivial Only specified but this is not a trivial operation.' aptget dist-upgrade --trivial-only
 
-	testequal 'Canceled hold on pkgarch.' aptmark unhold pkgarch
+	testsuccessequal 'Canceled hold on pkgarch.' aptmark unhold pkgarch
 	testempty aptmark showhold
 
-	testequal 'Reading package lists...
+	testfailureequal 'Reading package lists...
 Building dependency tree...
 Calculating upgrade...
 The following packages will be upgraded:
@@ -52,10 +52,10 @@ The following packages will be upgraded:
 After this operation, 0 B of additional disk space will be used.
 E: Trivial Only specified but this is not a trivial operation.' aptget dist-upgrade --trivial-only
 
-	testequal 'pkgall set on hold.' aptmark hold pkgall
-	testequal 'pkgall' aptmark showhold
+	testsuccessequal 'pkgall set on hold.' aptmark hold pkgall
+	testsuccessequal 'pkgall' aptmark showhold
 
-	testequal 'Reading package lists...
+	testfailureequal 'Reading package lists...
 Building dependency tree...
 Calculating upgrade...
 The following packages have been kept back:
@@ -66,7 +66,7 @@ The following packages will be upgraded:
 After this operation, 0 B of additional disk space will be used.
 E: Trivial Only specified but this is not a trivial operation.' aptget dist-upgrade --trivial-only
 
-	testequal 'Canceled hold on pkgall.' aptmark unhold pkgall
+	testsuccessequal 'Canceled hold on pkgall.' aptmark unhold pkgall
 	testempty aptmark showhold
 }
 # single-arch