make test_unauthenticated_to_invalid_inrelease work

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

diff --git a/test/integration/test-apt-progress-fd b/test/integration/test-apt-progress-fd
index 5f73c8f8c04837c7cdca9d375b93040298ca293a..7ddf355f34eddb6c5cb3dcedf0f0a462e1539ed4 100755 (executable)
--- a/test/integration/test-apt-progress-fd
+++ b/test/integration/test-apt-progress-fd
@@ -16,40 +16,39 @@ setupaptarchive
 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
 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
+dlstatus:1:20:Retrieving file 1 of 1

 pmstatus:dpkg-exec:0:Running dpkg
 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:testing:0:Installing testing (amd64)
+pmstatus:testing:20:Preparing testing (amd64)
+pmstatus:testing:40:Unpacking testing (amd64)
+pmstatus:testing:60:Preparing to configure testing (amd64)

 pmstatus:dpkg-exec:60:Running dpkg
 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
+pmstatus:testing:60:Configuring testing (amd64)
+pmstatus:testing:80:Configuring testing (amd64)
+pmstatus:testing:100:Installed testing (amd64)" cat apt-progress.log

 
 # 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
 
 # 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
+dlstatus:1:20:Retrieving file 1 of 1

 pmstatus:dpkg-exec:0:Running dpkg
 pmstatus:dpkg-exec:0:Running dpkg

-pmstatus:testing:20:Preparing testing
-pmstatus:testing:40:Unpacking testing
-pmstatus:testing:60:Preparing to configure testing
+pmstatus:testing:20:Preparing testing (amd64)
+pmstatus:testing:40:Unpacking testing (amd64)
+pmstatus:testing:60:Preparing to configure testing (amd64)

 pmstatus:dpkg-exec:60:Running dpkg
 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
+pmstatus:testing:60:Configuring testing (amd64)
+pmstatus:testing:80:Configuring testing (amd64)
+pmstatus:testing:100:Installed testing (amd64)" cat apt-progress.log

 
 # and remove
 exec 3> apt-progress.log
 testsuccess aptget remove testing -y -o APT::Status-Fd=3
 testequal "pmstatus:dpkg-exec:0:Running dpkg
 
 # 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
-
+pmstatus:testing:0:Removing testing (amd64)
+pmstatus:testing:33.3333:Preparing for removal of testing (amd64)
+pmstatus:testing:66.6667:Removing testing (amd64)
+pmstatus:testing:100:Removed testing (amd64)" cat apt-progress.log

 
 # install non-native and ensure we get proper progress info
 exec 3> apt-progress.log
 
 # install non-native and ensure we get proper progress info
 exec 3> apt-progress.log


@@ -57,15 +56,15 @@ testsuccess aptget install testing2:i386 -y -o APT::Status-Fd=3
 
 # and compare
 testequal "dlstatus:1:0:Retrieving file 1 of 1
 
 # and compare
 testequal "dlstatus:1:0:Retrieving file 1 of 1

-dlstatus:1:0:Retrieving file 1 of 1
+dlstatus:1:20:Retrieving file 1 of 1

 pmstatus:dpkg-exec:0:Running dpkg
 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:testing2:0:Installing testing2 (i386)
+pmstatus:testing2:20:Preparing testing2 (i386)
+pmstatus:testing2:40:Unpacking testing2 (i386)
+pmstatus:testing2:60:Preparing to configure testing2 (i386)

 pmstatus:dpkg-exec:60:Running dpkg
 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
+pmstatus:testing2:60:Configuring testing2 (i386)
+pmstatus:testing2:80:Configuring testing2 (i386)
+pmstatus:testing2:100:Installed testing2 (i386)" cat apt-progress.log

 
 

-rm -f apt-progress*.log
\ No newline at end of file
+rm -f apt-progress*.log