Merge lp:~vila/bzr/1269886-test-failure into lp:bzr
Proposed by
Vincent Ladeuil
Status: | Merged |
---|---|
Approved by: | Vincent Ladeuil |
Approved revision: | no longer in the source branch. |
Merged at revision: | 6590 |
Proposed branch: | lp:~vila/bzr/1269886-test-failure |
Merge into: | lp:bzr |
Diff against target: |
26 lines (+3/-3) 2 files modified
bzrlib/tests/test_smart_transport.py (+0/-3) doc/en/release-notes/bzr-2.7.txt (+3/-0) |
To merge this branch: | bzr merge lp:~vila/bzr/1269886-test-failure |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Richard Wilbur | Approve | ||
Review via email: mp+205324@code.launchpad.net |
Commit message
Fix test failure on recent trusty kernels (the failure can't be reproduced in a trusty chroot with a saucy kernel).
Description of the change
This can be reproduced (reliably) on recent trusty versions (note that a trusty chroot on a saucy host is not enough).
The affected test is still valid without the lines removed by that fix. Such lines were making an wrong assumption (as shown on trusty), the server can perfectly close the socket without its content being lost and the client can get that content (the test still succeds without these lines).
To post a comment you must log in.
Good work Vincent, thanks for the fix!
+1