Rev 6157: Change the name from _create_handler to _make_handler, to match similar code in the file. in http://bazaar.launchpad.net/~jameinel/bzr/drop-idle-connections-824797
John Arbash Meinel
john at arbash-meinel.com
Thu Sep 15 12:03:37 UTC 2011
At http://bazaar.launchpad.net/~jameinel/bzr/drop-idle-connections-824797
------------------------------------------------------------
revno: 6157
revision-id: john at arbash-meinel.com-20110915120323-1trvuysr9uyk3rhr
parent: john at arbash-meinel.com-20110915120121-w0am8xkmja3ddv5o
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: drop-idle-connections-824797
timestamp: Thu 2011-09-15 14:03:23 +0200
message:
Change the name from _create_handler to _make_handler, to match similar code in the file.
-------------- next part --------------
=== modified file 'bzrlib/smart/server.py'
--- a/bzrlib/smart/server.py 2011-09-15 11:47:55 +0000
+++ b/bzrlib/smart/server.py 2011-09-15 12:03:23 +0000
@@ -183,7 +183,7 @@
"""Return the url of the server"""
return "bzr://%s:%s/" % (self._sockname[0], self._sockname[1])
- def _create_handler(self, conn):
+ def _make_handler(self, conn):
return medium.SmartServerSocketStreamMedium(
conn, self.backing_transport, self.root_client_path,
timeout=self._client_timeout)
@@ -194,7 +194,7 @@
conn.setblocking(True)
conn.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
thread_name = 'smart-server-child' + thread_name_suffix
- handler = self._create_handler(conn)
+ handler = self._make_handler(conn)
connection_thread = threading.Thread(
None, handler.serve, name=thread_name)
# FIXME: This thread is never joined, it should at least be collected
=== modified file 'bzrlib/tests/test_smart_transport.py'
--- a/bzrlib/tests/test_smart_transport.py 2011-09-15 11:27:23 +0000
+++ b/bzrlib/tests/test_smart_transport.py 2011-09-15 12:03:23 +0000
@@ -1106,13 +1106,13 @@
def test_default_timeout(self):
server = _mod_server.SmartTCPServer(None)
server_socket = socket.socket()
- handler = server._create_handler(server_socket)
+ handler = server._make_handler(server_socket)
self.assertEqual(handler._DEFAULT_CLIENT_TIMEOUT, handler._client_timeout)
def test_propagates_timeout(self):
server = _mod_server.SmartTCPServer(None, client_timeout=1.23)
server_socket = socket.socket()
- handler = server._create_handler(server_socket)
+ handler = server._make_handler(server_socket)
self.assertEqual(1.23, handler._client_timeout)
=== modified file 'bzrlib/tests/test_test_server.py'
--- a/bzrlib/tests/test_test_server.py 2011-09-15 12:01:21 +0000
+++ b/bzrlib/tests/test_test_server.py 2011-09-15 12:03:23 +0000
@@ -228,6 +228,6 @@
self.assertEqual(test_server._DEFAULT_TESTING_CLIENT_TIMEOUT,
server._client_timeout)
sock = socket.socket()
- h = server._create_handler(sock)
+ h = server._make_handler(sock)
self.assertEqual(test_server._DEFAULT_TESTING_CLIENT_TIMEOUT,
h._client_timeout)
More information about the bazaar-commits
mailing list