Rev 6192: Remove the _client_poll_timeout. in http://bazaar.launchpad.net/~jameinel/bzr/2.5-longer-timeout

John Arbash Meinel john at arbash-meinel.com
Wed Oct 5 15:02:08 UTC 2011


At http://bazaar.launchpad.net/~jameinel/bzr/2.5-longer-timeout

------------------------------------------------------------
revno: 6192
revision-id: john at arbash-meinel.com-20111005150154-m8522v2u3ie7wpo2
parent: john at arbash-meinel.com-20111005145439-oht8dh0brzhg3lra
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.5-longer-timeout
timestamp: Wed 2011-10-05 17:01:54 +0200
message:
  Remove the _client_poll_timeout.
  
  It doesn't really have an effect in the test suite.
  It would change how quickly the loops take to notice if select() decides
  not to respond to a closed socket.
  But it won't change how quickly the server sockets are closed, because
  the SmartTCPServer_for_testing tracks them completely differently,
  and closes them directly in the stop_server() code.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_server.py'
--- a/bzrlib/tests/test_server.py	2011-10-05 14:54:39 +0000
+++ b/bzrlib/tests/test_server.py	2011-10-05 15:01:54 +0000
@@ -602,9 +602,6 @@
             self, request, server.backing_transport,
             server.root_client_path,
             timeout=_DEFAULT_TESTING_CLIENT_TIMEOUT)
-        # Override the default _client_poll_timeout, this way we quickly detect
-        # when we are requested to stop as part of stop_server().
-        self._client_poll_timeout = 0.1
         request.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
         SocketServer.BaseRequestHandler.__init__(self, request, client_address,
                                                  server)



More information about the bazaar-commits mailing list