Rev 6146: I updated the code so that ConnectionTimeout isn't raised out of serve, in http://bazaar.launchpad.net/~jameinel/bzr/drop-idle-connections-824797

John Arbash Meinel john at arbash-meinel.com
Thu Sep 15 09:30:19 UTC 2011


At http://bazaar.launchpad.net/~jameinel/bzr/drop-idle-connections-824797

------------------------------------------------------------
revno: 6146
revision-id: john at arbash-meinel.com-20110915093007-ky9gis8k58hzyo1i
parent: john at arbash-meinel.com-20110914134707-sx18ml5ey5o3wv38
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: drop-idle-connections-824797
timestamp: Thu 2011-09-15 11:30:07 +0200
message:
  I updated the code so that ConnectionTimeout isn't raised out of serve,
  but I forgot to update the associated test case.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_smart_transport.py'
--- a/bzrlib/tests/test_smart_transport.py	2011-09-14 12:58:17 +0000
+++ b/bzrlib/tests/test_smart_transport.py	2011-09-15 09:30:07 +0000
@@ -979,7 +979,7 @@
         # This should timeout quickly, and then close the connection so that
         # client_sock recv doesn't block.
         server._stream_medium_timeout = 0.1
-        self.assertRaises(errors.ConnectionTimeout, server.serve)
+        server.serve()
         self.assertEqual('', client_sock.recv(1))
 
     def test_pipe_wait_for_bytes_with_timeout_with_data(self):



More information about the bazaar-commits mailing list