X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/e8022b09e73ee89d3b748e1c8dba82abba5b37f3..4f242a2289cc5db7a53afdb875291c94de64fd90:/test/integration/test-apt-progress-fd?ds=inline diff --git a/test/integration/test-apt-progress-fd b/test/integration/test-apt-progress-fd index 5f73c8f8c..57728ca81 100755 --- a/test/integration/test-apt-progress-fd +++ b/test/integration/test-apt-progress-fd @@ -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' 'i386' @@ -15,57 +15,71 @@ setupaptarchive # install native exec 3> apt-progress.log testsuccess aptget install testing=0.1 -y -o APT::Status-Fd=3 -testequal "dlstatus:1:0:Retrieving file 1 of 1 -dlstatus:1:0:Retrieving file 1 of 1 -pmstatus:dpkg-exec:0:Running dpkg -pmstatus:testing:0:Installing testing -pmstatus:testing:20:Preparing testing -pmstatus:testing:40:Unpacking testing -pmstatus:testing:60:Preparing to configure testing -pmstatus:dpkg-exec:60:Running dpkg -pmstatus:testing:60:Configuring testing -pmstatus:testing:80:Configuring testing -pmstatus:testing:100:Installed testing" cat apt-progress.log +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:16.6667:Preparing testing (amd64) +pmstatus:testing:33.3333:Unpacking testing (amd64) +pmstatus:testing:50.0000:Preparing to configure testing (amd64) +pmstatus:dpkg-exec:50.0000:Running dpkg +pmstatus:testing:50.0000:Configuring testing (amd64) +pmstatus:testing:66.6667:Configuring testing (amd64) +pmstatus:testing:83.3333:Installed testing (amd64)' # upgrade exec 3> apt-progress.log testsuccess aptget install testing=0.8.15 -y -o APT::Status-Fd=3 -testequal "dlstatus:1:0:Retrieving file 1 of 1 -dlstatus:1:0:Retrieving file 1 of 1 -pmstatus:dpkg-exec:0:Running dpkg -pmstatus:testing:20:Preparing testing -pmstatus:testing:40:Unpacking testing -pmstatus:testing:60:Preparing to configure testing -pmstatus:dpkg-exec:60:Running dpkg -pmstatus:testing:60:Configuring testing -pmstatus:testing:80:Configuring testing -pmstatus:testing:100:Installed testing" cat apt-progress.log +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:16.6667:Preparing testing (amd64) +pmstatus:testing:33.3333:Unpacking testing (amd64) +pmstatus:testing:50.0000:Preparing to configure testing (amd64) +pmstatus:dpkg-exec:50.0000:Running dpkg +pmstatus:testing:50.0000:Configuring testing (amd64) +pmstatus:testing:66.6667:Configuring testing (amd64) +pmstatus:testing:83.3333:Installed testing (amd64)' + +# reinstall +exec 3> apt-progress.log +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:16.6667:Preparing testing (amd64) +pmstatus:testing:33.3333:Unpacking testing (amd64) +pmstatus:testing:50.0000:Preparing to configure testing (amd64) +pmstatus:dpkg-exec:50.0000:Running dpkg +pmstatus:testing:50.0000:Configuring testing (amd64) +pmstatus:testing:66.6667:Configuring testing (amd64) +pmstatus:testing:83.3333:Installed testing (amd64)' # and remove exec 3> apt-progress.log testsuccess aptget remove testing -y -o APT::Status-Fd=3 -testequal "pmstatus:dpkg-exec:0:Running dpkg -pmstatus:testing:0:Removing testing -pmstatus:testing:33.3333:Preparing for removal of testing -pmstatus:testing:66.6667:Removing testing -pmstatus:testing:100:Removed testing" cat apt-progress.log - +testfileequal './apt-progress.log' 'pmstatus:dpkg-exec:0.0000:Running dpkg +pmstatus:testing:0.0000:Removing testing (amd64) +pmstatus:testing:25.0000:Preparing for removal of testing (amd64) +pmstatus:testing:50.0000:Removing testing (amd64) +pmstatus:testing:75.0000:Removed testing (amd64) +pmstatus:dpkg-exec:75.0000:Running dpkg' # install non-native and ensure we get proper progress info exec 3> apt-progress.log 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:16.6667:Preparing testing2 (i386) +pmstatus:testing2:33.3333:Unpacking testing2 (i386) +pmstatus:testing2:50.0000:Preparing to configure testing2 (i386) +pmstatus:dpkg-exec:50.0000:Running dpkg +pmstatus:testing2:50.0000:Configuring testing2 (i386) +pmstatus:testing2:66.6667:Configuring testing2 (i386) +pmstatus:testing2:83.3333:Installed testing2 (i386)' -# and compare -testequal "dlstatus:1:0:Retrieving file 1 of 1 -dlstatus:1:0:Retrieving file 1 of 1 -pmstatus:dpkg-exec:0:Running dpkg -pmstatus:testing2:0:Installing testing2 -pmstatus:testing2:20:Preparing testing2 -pmstatus:testing2:40:Unpacking testing2 -pmstatus:testing2:60:Preparing to configure testing2 -pmstatus:dpkg-exec:60:Running dpkg -pmstatus:testing2:60:Configuring testing2 -pmstatus:testing2:80:Configuring testing2 -pmstatus:testing2:100:Installed testing2" cat apt-progress.log - -rm -f apt-progress*.log \ No newline at end of file +rm -f apt-progress*.log