summaryrefslogtreecommitdiff
path: root/test/integration/test-bug-591882-conkeror
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2014-08-17 12:30:21 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2014-09-27 00:10:05 +0200
commit2a884c612b10b27f4be2cc6dd689bfe448d9361a (patch)
tree2b5b31e255115ac3b9221a39e852723d6d48438d /test/integration/test-bug-591882-conkeror
parentb13ce62c7e7db6a0e80a0f4729ee00105466c3ac (diff)
fix progress output for (dist-)upgrade calculation
Previously, we had a start and a done of the calculation printed by higher-level code, but this got intermixed by progress reporting from an external solver or the output of autoremove codeā€¦ The higherlevel code is now only responsible for instantiating a progress object of its choosing (if it wants progress after all) and the rest will be handled by the upgrade code. Either it is used to show the progress of the external solver or the internal solver will give some hints about its overall progress. The later isn't really a proper progress as it will jump forward after each substep, but that is at least a bit better than before without any progress indication. Fixes also the 'strange' non-display of this progress line in -q=1, while all others are shown, which is reflected by all testcase changes.
Diffstat (limited to 'test/integration/test-bug-591882-conkeror')
-rwxr-xr-xtest/integration/test-bug-591882-conkeror2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/integration/test-bug-591882-conkeror b/test/integration/test-bug-591882-conkeror
index e1c0b42d1..891ddb8b7 100755
--- a/test/integration/test-bug-591882-conkeror
+++ b/test/integration/test-bug-591882-conkeror
@@ -9,6 +9,7 @@ setupaptarchive
UPGRADEFAIL="Reading package lists...
Building dependency tree...
+Calculating upgrade...
The following packages will be REMOVED:
conkeror libdatrie0 libkrb53 libxcb-xlib0 xulrunner-1.9
The following NEW packages will be installed:
@@ -40,6 +41,7 @@ E: Trivial Only specified but this is not a trivial operation."
UPGRADESUCCESS="Reading package lists...
Building dependency tree...
+Calculating upgrade...
The following packages will be REMOVED:
libdatrie0 libkrb53 libxcb-xlib0 xulrunner-1.9
The following NEW packages will be installed: