diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2019-02-21 15:11:41 +0100 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2019-02-21 16:47:25 +0100 |
| commit | 04a03c849460ca081fa2570f2eeb73c1b46c463c (patch) | |
| tree | 5400a8e5f42a1b63e73380195a05fffd66df9a58 | |
| parent | 14277418f2daa0f668f1d1aa733b6fc404fdf6ad (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.
(cherry-picked from commit f920cbe8527ce523974da2563ca1165790c1d40e)
LP: #1817088
| -rwxr-xr-x | test/integration/test-apt-progress-fd-error | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/test/integration/test-apt-progress-fd-error b/test/integration/test-apt-progress-fd-error index 96d66371a..6d31980b7 100755 --- a/test/integration/test-apt-progress-fd-error +++ b/test/integration/test-apt-progress-fd-error @@ -18,5 +18,9 @@ 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 |