From f484906eff85c8c9eadc13ce817d8857abdd08e8 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Mon, 10 Sep 2018 18:43:34 +0200
Subject: Don't expect duplicated dpkg status-fd messages

The progress reporting relies on parsing the status reports of
dpkg which used to repeat being in the same state multiple times
in the same run, but by fixing #365921 it will stop doing so.

The problem is in theory just with 'config-files' in case we do purge as
this (can) do remove + purge in one step, but we remove this also for
the unpack + configure combination althrough we handle these currently
in two independent dpkg calls.
---
 test/integration/test-apt-progress-fd-deb822 | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

(limited to '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 d9a4505d1..0c6c525ae 100755
--- a/test/integration/test-apt-progress-fd-deb822
+++ b/test/integration/test-apt-progress-fd-deb822
@@ -10,7 +10,7 @@ configarchitecture 'amd64' 'i386'
 buildsimplenativepackage 'testing' 'amd64' '0.1' 'stable'
 buildsimplenativepackage 'testing' 'all' '0.8.15' 'stable'
 buildsimplenativepackage 'testing2' 'amd64,i386' '0.8.15' 'stable'
-setupaptarchive 
+setupaptarchive
 
 # install native
 exec 3> apt-progress.log
@@ -27,36 +27,31 @@ Message: Installing testing (amd64)
 
 Status: progress
 Package: testing:amd64
-Percent: 16.6667
+Percent: 20.0000
 Message: Preparing testing (amd64)
 
 Status: progress
 Package: testing:amd64
-Percent: 33.3333
+Percent: 40.0000
 Message: Unpacking testing (amd64)
 
 Status: progress
-Package: testing:amd64
-Percent: 50.0000
-Message: Preparing to configure testing (amd64)
-
-Status: progress
-Percent: 50.0000
+Percent: 40.0000
 Message: Running dpkg
 
 Status: progress
 Package: testing:amd64
-Percent: 50.0000
+Percent: 40.0000
 Message: Configuring testing (amd64)
 
 Status: progress
 Package: testing:amd64
-Percent: 66.6667
+Percent: 60.0000
 Message: Configuring testing (amd64)
 
 Status: progress
 Package: testing:amd64
-Percent: 83.3333
+Percent: 80.0000
 Message: Installed testing (amd64)
 '
 
-- 
cgit v1.2.3