Rev 6590: (vila) Fix test failure on recent trusty kernels (the failure can't be in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6590 [merge]
revision-id: pqm at pqm.ubuntu.com-20140210100230-qwdxah7k01yaz51f
parent: pqm at pqm.ubuntu.com-20131007170434-mb0ahksmrzsnhi1i
parent: v.ladeuil+lp at free.fr-20140207102038-17sgslnv35no6bsu
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2014-02-10 10:02:30 +0000
message:
  (vila) Fix test failure on recent trusty kernels (the failure can't be
   reproduced in a trusty chroot with a saucy kernel). (Vincent Ladeuil)
modified:
  bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
  doc/en/release-notes/bzr-2.7.txt bzr2.7.txt-20130727124539-wnx897hy9l2h9f7x-1
=== 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)