diff options
author | David Kalnischkies <david@kalnischkies.de> | 2018-09-10 21:34:11 +0200 |
---|---|---|
committer | David Kalnischkies <david@kalnischkies.de> | 2018-09-11 13:08:58 +0200 |
commit | 329c8d5e149465003ea9007661a7af1099c75c43 (patch) | |
tree | 9bc1bf359dd2753cff063e3cb68b71ef88231ccd /test/integration/test-apt-progress-fd | |
parent | f484906eff85c8c9eadc13ce817d8857abdd08e8 (diff) |
Reorder progress report messages
We are seeing 'processing' messages from dpkg first, so it makes sense
to translate them to "Preparing" messages instead of using "Installing"
and co to override these shortly after with the "Preparing" messages.
The difference isn't all to visible as later messages tend to linger far
longer in the display than the ealier ones, but at least in a listing it
seems more logical.
Diffstat (limited to 'test/integration/test-apt-progress-fd')
-rwxr-xr-x | test/integration/test-apt-progress-fd | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/test/integration/test-apt-progress-fd b/test/integration/test-apt-progress-fd index 2b9b6532a..4c19a7b00 100755 --- a/test/integration/test-apt-progress-fd +++ b/test/integration/test-apt-progress-fd @@ -18,11 +18,11 @@ testsuccess aptget install testing=0.1 -y -o APT::Status-Fd=3 testfileequal './apt-progress.log' 'dlstatus:1:0.0000:Retrieving file 1 of 1 dlstatus:1:100.0000:Retrieving file 1 of 1 pmstatus:dpkg-exec:0.0000:Running dpkg -pmstatus:testing:0.0000:Installing testing (amd64) -pmstatus:testing:20.0000:Preparing testing (amd64) -pmstatus:testing:40.0000:Unpacking testing (amd64) +pmstatus:testing:0.0000:Preparing testing (amd64) +pmstatus:testing:20.0000:Unpacking testing (amd64) +pmstatus:testing:40.0000:Installing testing (amd64) pmstatus:dpkg-exec:40.0000:Running dpkg -pmstatus:testing:40.0000:Configuring testing (amd64) +pmstatus:testing:40.0000:Preparing to configure testing (amd64) pmstatus:testing:60.0000:Configuring testing (amd64) pmstatus:testing:80.0000:Installed testing (amd64)' @@ -32,11 +32,11 @@ testsuccess aptget install testing=0.8.15 -y -o APT::Status-Fd=3 testfileequal './apt-progress.log' 'dlstatus:1:0.0000:Retrieving file 1 of 1 dlstatus:1:100.0000:Retrieving file 1 of 1 pmstatus:dpkg-exec:0.0000:Running dpkg -pmstatus:testing:0.0000:Installing testing (amd64) -pmstatus:testing:20.0000:Preparing testing (amd64) -pmstatus:testing:40.0000:Unpacking testing (amd64) +pmstatus:testing:0.0000:Preparing testing (amd64) +pmstatus:testing:20.0000:Unpacking testing (amd64) +pmstatus:testing:40.0000:Installing testing (amd64) pmstatus:dpkg-exec:40.0000:Running dpkg -pmstatus:testing:40.0000:Configuring testing (amd64) +pmstatus:testing:40.0000:Preparing to configure testing (amd64) pmstatus:testing:60.0000:Configuring testing (amd64) pmstatus:testing:80.0000:Installed testing (amd64)' @@ -46,11 +46,11 @@ testsuccess aptget install testing=0.8.15 --reinstall -y -o APT::Status-Fd=3 testfileequal './apt-progress.log' 'dlstatus:1:0.0000:Retrieving file 1 of 1 dlstatus:1:100.0000:Retrieving file 1 of 1 pmstatus:dpkg-exec:0.0000:Running dpkg -pmstatus:testing:0.0000:Installing testing (amd64) -pmstatus:testing:20.0000:Preparing testing (amd64) -pmstatus:testing:40.0000:Unpacking testing (amd64) +pmstatus:testing:0.0000:Preparing testing (amd64) +pmstatus:testing:20.0000:Unpacking testing (amd64) +pmstatus:testing:40.0000:Installing testing (amd64) pmstatus:dpkg-exec:40.0000:Running dpkg -pmstatus:testing:40.0000:Configuring testing (amd64) +pmstatus:testing:40.0000:Preparing to configure testing (amd64) pmstatus:testing:60.0000:Configuring testing (amd64) pmstatus:testing:80.0000:Installed testing (amd64)' @@ -58,8 +58,8 @@ pmstatus:testing:80.0000:Installed testing (amd64)' exec 3> apt-progress.log testsuccess aptget remove testing -y -o APT::Status-Fd=3 testfileequal './apt-progress.log' 'pmstatus:dpkg-exec:0.0000:Running dpkg -pmstatus:testing:0.0000:Removing testing (amd64) -pmstatus:testing:33.3333:Preparing for removal of testing (amd64) +pmstatus:testing:0.0000:Preparing for removal of testing (amd64) +pmstatus:testing:33.3333:Removing testing (amd64) pmstatus:testing:66.6667:Removing testing (amd64) pmstatus:dpkg-exec:66.6667:Running dpkg' @@ -69,11 +69,11 @@ testsuccess aptget install testing2:i386 -y -o APT::Status-Fd=3 testfileequal './apt-progress.log' 'dlstatus:1:0.0000:Retrieving file 1 of 1 dlstatus:1:100.0000:Retrieving file 1 of 1 pmstatus:dpkg-exec:0.0000:Running dpkg -pmstatus:testing2:0.0000:Installing testing2 (i386) -pmstatus:testing2:20.0000:Preparing testing2 (i386) -pmstatus:testing2:40.0000:Unpacking testing2 (i386) +pmstatus:testing2:0.0000:Preparing testing2 (i386) +pmstatus:testing2:20.0000:Unpacking testing2 (i386) +pmstatus:testing2:40.0000:Installing testing2 (i386) pmstatus:dpkg-exec:40.0000:Running dpkg -pmstatus:testing2:40.0000:Configuring testing2 (i386) +pmstatus:testing2:40.0000:Preparing to configure testing2 (i386) pmstatus:testing2:60.0000:Configuring testing2 (i386) pmstatus:testing2:80.0000:Installed testing2 (i386)' |