Rev 6590: Fix test failure on recent Ubuntu Trusty versions without weakening the test itself. in file:///home/vila/src/bzr/bugs/1269886-test-failure/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/1269886-test-failure/

------------------------------------------------------------
revno: 6590
revision-id: v.ladeuil+lp at free.fr-20140207102038-17sgslnv35no6bsu
parent: pqm at pqm.ubuntu.com-20131007170434-mb0ahksmrzsnhi1i
fixes bug: https://launchpad.net/bugs/1269886
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 1269886-test-failure
timestamp: Fri 2014-02-07 11:20:38 +0100
message:
  Fix test failure on recent Ubuntu Trusty versions without weakening the test itself.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_smart_transport.py'
--- a/bzrlib/tests/test_smart_transport.py	2013-06-24 12:03:12 +0000
+++ b/bzrlib/tests/test_smart_transport.py	2014-02-07 10:20:38 +0000
@@ -1453,9 +1453,6 @@
         server._stopped.wait()
         # It should not be accepting another connection.
         self.assertRaises(socket.error, self.connect_to_server, server)
-        # It should also not be fully stopped
-        server._fully_stopped.wait(0.01)
-        self.assertFalse(server._fully_stopped.isSet())
         response_handler.read_body_bytes()
         client_sock.close()
         server_side_thread.join()

=== modified file 'doc/en/release-notes/bzr-2.7.txt'
--- a/doc/en/release-notes/bzr-2.7.txt	2013-10-07 16:35:59 +0000
+++ b/doc/en/release-notes/bzr-2.7.txt	2014-02-07 10:20:38 +0000
@@ -60,6 +60,9 @@
    suite.  This can include new facilities for writing tests, fixes to 
    spurious test failures and changes to the way things should be tested.
 
+* Remove wrong assumption about how TCP server and client interact when run
+  inside the same process. (Vincent Ladeuil, #1269886).
+
 * Restrict access to '.netrc' in tests or recent python (2.7.5-8) will
   complain. (Vincent Ladeuil, #1233413)