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
old mode 100644 (file)
new mode 100755 (executable)
index 0a7be0c..d9a4505
--- a/test/integration/test-apt-progress-fd-deb822
+++ b/test/integration/test-apt-progress-fd-deb822
@@ -1,8 +1,8 @@
-
+#!/bin/sh

 set -e
 
 set -e
 

-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"

 
 setupenvironment
 configarchitecture 'amd64' 'i386'
 
 setupenvironment
 configarchitecture 'amd64' 'i386'


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

-testequal "# and compare
-testequal "percent:0
-message: Running dpkg
-
-package: testing2
-percent: 0
-message: Installing testing2 (i386)
-
-package: testing2
-percent: 20
-message: Preparing testing2 (i386)
-
-package: testing2
-percent: 40
-message: Unpacking testing2 (i386)
-
-package: testing2
-percent: 60
-message: Preparing to configure testing2 (i386)
-
-percent: 60
-message: Running dpkg
-
-package: testing2
-percent: 60
-message: Configuring testing2 (i386)
-
-package: testing2
-percent: 80
-message: Configuring testing2 (i386)
-
-package: testing2
-percent: 100
-message: Installed testing2 (i386)" cat apt-progress.log

 
 

+testfileequal './apt-progress.log' 'Status: progress
+Percent: 0.0000
+Message: Running dpkg
+
+Status: progress
+Package: testing:amd64
+Percent: 0.0000
+Message: Installing testing (amd64)
+
+Status: progress
+Package: testing:amd64
+Percent: 16.6667
+Message: Preparing testing (amd64)
+
+Status: progress
+Package: testing:amd64
+Percent: 33.3333
+Message: Unpacking testing (amd64)
+
+Status: progress
+Package: testing:amd64
+Percent: 50.0000
+Message: Preparing to configure testing (amd64)
+
+Status: progress
+Percent: 50.0000
+Message: Running dpkg
+
+Status: progress
+Package: testing:amd64
+Percent: 50.0000
+Message: Configuring testing (amd64)
+
+Status: progress
+Package: testing:amd64
+Percent: 66.6667
+Message: Configuring testing (amd64)
+
+Status: progress
+Package: testing:amd64
+Percent: 83.3333
+Message: Installed testing (amd64)
+'

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