diff options
| author | Julian Andres Klode <jak@debian.org> | 2018-09-18 12:05:20 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2018-09-18 12:05:20 +0000 |
| commit | 252a0a5020726a7b1ee53f2ed5f00e1210f5f4d1 (patch) | |
| tree | cde08981d617e61cd88103b2615b8cb55ae518a0 /test/integration/test-apt-progress-fd-error | |
| parent | 32e0587d1819ca4b09cd146b0114a1c56ce4a8a9 (diff) | |
| parent | 329c8d5e149465003ea9007661a7af1099c75c43 (diff) | |
Merge branch 'bugfix/statusfd' into 'master'
Process all of --status-fd and don't expect duplicate status msg
See merge request apt-team/apt!26
Diffstat (limited to 'test/integration/test-apt-progress-fd-error')
| -rwxr-xr-x | test/integration/test-apt-progress-fd-error | 4 |
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 |