Merge lp:~vila/bzr/1269886-test-failure into lp:bzr

Proposed by Vincent Ladeuil on 2014-02-07
Status: Merged
Approved by: Vincent Ladeuil on 2014-02-10
Approved revision: 6590
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/ (+0/-3)
doc/en/release-notes/bzr-2.7.txt (+3/-0)
To merge this branch: bzr merge lp:~vila/bzr/1269886-test-failure
Reviewer Review Type Date Requested Status
Richard Wilbur 2014-02-07 Approve on 2014-02-10
Review via email:

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.
Richard Wilbur (richard-wilbur) wrote :

Good work Vincent, thanks for the fix!

review: Approve
Vincent Ladeuil (vila) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/tests/'
2--- bzrlib/tests/ 2013-06-24 12:03:12 +0000
3+++ bzrlib/tests/ 2014-02-07 10:27:00 +0000
4@@ -1453,9 +1453,6 @@
5 server._stopped.wait()
6 # It should not be accepting another connection.
7 self.assertRaises(socket.error, self.connect_to_server, server)
8- # It should also not be fully stopped
9- server._fully_stopped.wait(0.01)
10- self.assertFalse(server._fully_stopped.isSet())
11 response_handler.read_body_bytes()
12 client_sock.close()
13 server_side_thread.join()
15=== modified file 'doc/en/release-notes/bzr-2.7.txt'
16--- doc/en/release-notes/bzr-2.7.txt 2013-10-07 16:35:59 +0000
17+++ doc/en/release-notes/bzr-2.7.txt 2014-02-07 10:27:00 +0000
18@@ -60,6 +60,9 @@
19 suite. This can include new facilities for writing tests, fixes to
20 spurious test failures and changes to the way things should be tested.
22+* Remove wrong assumption about how TCP server and client interact when run
23+ inside the same process. (Vincent Ladeuil, #1269886).
25 * Restrict access to '.netrc' in tests or recent python (2.7.5-8) will
26 complain. (Vincent Ladeuil, #1233413)