summaryrefslogtreecommitdiff
path: root/test/integration/test-apt-progress-fd-error
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2018-09-10 18:43:34 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2018-09-11 13:08:58 +0200
commitf484906eff85c8c9eadc13ce817d8857abdd08e8 (patch)
tree90103cce563f9275ef8e49715a55be60f3532876 /test/integration/test-apt-progress-fd-error
parent2295de2c97e6d1290a86e0b160885212411510a5 (diff)
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.
Diffstat (limited to 'test/integration/test-apt-progress-fd-error')
-rwxr-xr-xtest/integration/test-apt-progress-fd-error4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/integration/test-apt-progress-fd-error b/test/integration/test-apt-progress-fd-error
index 4439c042a..39c1053a1 100755
--- a/test/integration/test-apt-progress-fd-error
+++ b/test/integration/test-apt-progress-fd-error
@@ -18,8 +18,8 @@ setupaptarchive
exec 3> apt-progress.log
testfailure aptget install foo1 foo2 -y -o APT::Status-Fd=3
-msgtest 'Ensure correct error message'
-testsuccess --nomsg grep "foo2_0.8.15_[^.]\+.deb:36.3636:trying to overwrite '/usr/bin/file-conflict', which is also in package foo1 0.8.15" apt-progress.log
+msgtest 'Ensure correct error message' 'file-conflict'
+testsuccess --nomsg grep "foo2_0.8.15_[^.]\+.deb:[0-9.]\+:trying to overwrite '/usr/bin/file-conflict', which is also in package foo1 0.8.15" apt-progress.log
testsuccess test -s rootdir/var/crash/foo2.0.crash
testsuccess grep '^Package: foo2 0.8.15$' rootdir/var/crash/foo2.0.crash