run update post-invokes even on (partial) failures

[apt.git] / test / integration / test-bug-680041-apt-mark-holds-correctly

diff --git a/test/integration/test-bug-680041-apt-mark-holds-correctly b/test/integration/test-bug-680041-apt-mark-holds-correctly
index 2e5e39c8ed39e72f47060a6fb81d82c6503c1d0e..49bb21bc180629666dc334c7cccff46aea3b3315 100755 (executable)
--- 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
 
 #!/bin/sh
 set -e
 

-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"

 setupenvironment
 configarchitecture 'amd64'
 
 setupenvironment
 configarchitecture 'amd64'
 


@@ -17,19 +17,21 @@ setupaptarchive
 runtests() {
        testempty aptmark showhold
 
 runtests() {
        testempty aptmark showhold
 

-       testequal 'Reading package lists...
+       testfailureequal 'Reading package lists...

 Building dependency tree...
 Building dependency tree...

+Calculating upgrade...

 The following packages will be upgraded:
   pkgall pkgarch
 2 upgraded, 0 newly installed, 0 to remove and 0 not 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
 
 The following packages will be upgraded:
   pkgall pkgarch
 2 upgraded, 0 newly installed, 0 to remove and 0 not 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...
 Building dependency tree...

+Calculating upgrade...

 The following packages have been kept back:
   pkgarch
 The following packages will be upgraded:
 The following packages have been kept back:
   pkgarch
 The following packages will be upgraded:


@@ -38,22 +40,24 @@ 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
 
 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
 
        testempty aptmark showhold
 

-       testequal 'Reading package lists...
+       testfailureequal 'Reading package lists...

 Building dependency tree...
 Building dependency tree...

+Calculating upgrade...

 The following packages will be upgraded:
   pkgall pkgarch
 2 upgraded, 0 newly installed, 0 to remove and 0 not 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
 
 The following packages will be upgraded:
   pkgall pkgarch
 2 upgraded, 0 newly installed, 0 to remove and 0 not 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...
 Building dependency tree...

+Calculating upgrade...

 The following packages have been kept back:
   pkgall
 The following packages will be upgraded:
 The following packages have been kept back:
   pkgall
 The following packages will be upgraded:


@@ -62,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
 
 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
        testempty aptmark showhold
 }
 # single-arch