diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-10-06 17:42:39 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-10-06 17:42:39 +0200 |
| commit | a2d40703e4a5590a689ace4466f92e590434944d (patch) | |
| tree | 5e878fcc11eb94d96c65940ef3d30e922f217950 /test/integration/test-apt-progress-fd-error | |
| parent | ffd2dd93a640b47663ebdccc4fda00b426b3db71 (diff) | |
| parent | 00a06b8eb82cf930511fc003bd16d7034e5a0cb5 (diff) | |
make http size check work
Diffstat (limited to 'test/integration/test-apt-progress-fd-error')
| -rwxr-xr-x | test/integration/test-apt-progress-fd-error | 7 |
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 |