summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2014-09-07 22:08:01 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2014-09-07 22:12:05 +0200
commitf920cbe8527ce523974da2563ca1165790c1d40e (patch)
tree27a6d0c26495a9b76a7d61e7b38d1ab529d0da58
parentb578738870e83db4e61d6f6591bc73884108b7d4 (diff)
fix and non-silent fail dpkg-overwrite error test
Commit cbcdd3ee9d86379d1b3a44e41ae8b17dc23111d0 removes the space at the end of the debfile name dpkg send to us and we previously had included in the pmerror message we printed on the statusfd. Git-Dch: Ignore
-rwxr-xr-xtest/integration/test-apt-progress-fd-error7
1 files changed, 6 insertions, 1 deletions
diff --git a/test/integration/test-apt-progress-fd-error b/test/integration/test-apt-progress-fd-error
index 96d66371a..a47095b9b 100755
--- a/test/integration/test-apt-progress-fd-error
+++ b/test/integration/test-apt-progress-fd-error
@@ -18,5 +18,10 @@ setupaptarchive
exec 3> apt-progress.log
testfailure aptget install foo1 foo2 -y -o APT::Status-Fd=3
msgtest "Ensure correct error message"
-grep -q "aptarchive/pool/foo2_0.8.15_amd64.deb :40:trying to overwrite '/usr/bin/file-conflict', which is also in package foo1 0.8.15" apt-progress.log && msgpass || (cat apt-progress.log && msgfail)
+if grep -q "aptarchive/pool/foo2_0.8.15_amd64.deb:40:trying to overwrite '/usr/bin/file-conflict', which is also in package foo1 0.8.15" apt-progress.log; then
+ msgpass
+else
+ cat apt-progress.log
+ msgfail
+fi