diff options
| author | Michael Vogt <mvo@debian.org> | 2015-06-23 12:17:35 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2015-06-23 12:17:35 +0100 |
| commit | 245dde96193702f7f51389d3583dee547f8ba366 (patch) | |
| tree | 6cf8c191641c760bcc6a6c08fb0ff65d27e0cffd /test/integration/test-bug-680041-apt-mark-holds-correctly | |
| parent | 5530255b5f3ad7de2e23dfcb39ce325001126501 (diff) | |
| parent | c8a4ce6cbed57ae108dc955d4a850f9b129a0693 (diff) | |
Merge remote-tracking branch 'donkult/debian/experimental' into debian/experimental
Diffstat (limited to 'test/integration/test-bug-680041-apt-mark-holds-correctly')
| -rwxr-xr-x | test/integration/test-bug-680041-apt-mark-holds-correctly | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/test/integration/test-bug-680041-apt-mark-holds-correctly b/test/integration/test-bug-680041-apt-mark-holds-correctly index 3f40c23dc..a6fe76bc2 100755 --- a/test/integration/test-bug-680041-apt-mark-holds-correctly +++ b/test/integration/test-bug-680041-apt-mark-holds-correctly @@ -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 |