implement generic config fallback for methods

[apt.git] / test / integration / test-apt-progress-fd-deb822

diff --git a/test/integration/test-apt-progress-fd-deb822 b/test/integration/test-apt-progress-fd-deb822
index 9d227942d1fb66e9ea58bc96fe6955bb07aa7ec8..d9a4505d1089eb22b1726df365cc9e8681aaf7e5 100755 (executable)
--- a/test/integration/test-apt-progress-fd-deb822
+++ b/test/integration/test-apt-progress-fd-deb822
@@ -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' 'i386'
 
 setupenvironment
 configarchitecture 'amd64' 'i386'


@@ -16,49 +16,48 @@ setupaptarchive
 exec 3> apt-progress.log
 testsuccess aptget install testing=0.1 -y -o APT::Status-deb822-Fd=3
 
 exec 3> apt-progress.log
 testsuccess aptget install testing=0.1 -y -o APT::Status-deb822-Fd=3
 

-testequal "Status: progress
-Percent: 0
+testfileequal './apt-progress.log' 'Status: progress
+Percent: 0.0000

 Message: Running dpkg
 
 Status: progress
 Package: testing:amd64
 Message: Running dpkg
 
 Status: progress
 Package: testing:amd64

-Percent: 0
+Percent: 0.0000

 Message: Installing testing (amd64)
 
 Status: progress
 Package: testing:amd64
 Message: Installing testing (amd64)
 
 Status: progress
 Package: testing:amd64

-Percent: 20
+Percent: 16.6667

 Message: Preparing testing (amd64)
 
 Status: progress
 Package: testing:amd64
 Message: Preparing testing (amd64)
 
 Status: progress
 Package: testing:amd64

-Percent: 40
+Percent: 33.3333

 Message: Unpacking testing (amd64)
 
 Status: progress
 Package: testing:amd64
 Message: Unpacking testing (amd64)
 
 Status: progress
 Package: testing:amd64

-Percent: 60
+Percent: 50.0000

 Message: Preparing to configure testing (amd64)
 
 Status: progress
 Message: Preparing to configure testing (amd64)
 
 Status: progress

-Percent: 60
+Percent: 50.0000

 Message: Running dpkg
 
 Status: progress
 Package: testing:amd64
 Message: Running dpkg
 
 Status: progress
 Package: testing:amd64

-Percent: 60
+Percent: 50.0000

 Message: Configuring testing (amd64)
 
 Status: progress
 Package: testing:amd64
 Message: Configuring testing (amd64)
 
 Status: progress
 Package: testing:amd64

-Percent: 80
+Percent: 66.6667

 Message: Configuring testing (amd64)
 
 Status: progress
 Package: testing:amd64
 Message: Configuring testing (amd64)
 
 Status: progress
 Package: testing:amd64

-Percent: 100
+Percent: 83.3333

 Message: Installed testing (amd64)
 Message: Installed testing (amd64)

-" cat apt-progress.log
-
+'

 
 rm -f apt-progress*.log
 
 rm -f apt-progress*.log