Rename _adapter_get_write_buffer_size to _get_write_buffer_size

pika · Feb 1, 2019 · ecc0e59 · ecc0e59
1 parent e8950f2
commit ecc0e59
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/pika/adapters/blocking_connection.py b/pika/adapters/blocking_connection.py
@@ -513,7 +513,7 @@ def _flush_output(self, *waiters):
         is_done = (lambda:
                    self._closed_result.ready or
                    ((not self._impl._transport or
-                     self._impl._adapter_get_write_buffer_size() == 0) and
+                     self._impl._get_write_buffer_size() == 0) and
                     (not waiters or any(ready() for ready in waiters))))
 
         # Process I/O until our completion condition is satisfied

diff --git a/pika/adapters/select_connection.py b/pika/adapters/select_connection.py
@@ -137,7 +137,7 @@ def connection_factory(params):
             workflow=workflow,
             on_done=on_done)
 
-    def _adapter_get_write_buffer_size(self):
+    def _get_write_buffer_size(self):
         """
         :return: Current size of output data buffered by the transport
         :rtype: int

diff --git a/tests/unit/blocking_connection_tests.py b/tests/unit/blocking_connection_tests.py
@@ -40,7 +40,7 @@ class SelectConnectionTemplate(
     _channels = None
     ioloop = None
     _transport = None
-    _adapter_get_write_buffer_size = None
+    _get_write_buffer_size = None
 
 
 class BlockingConnectionTests(unittest.TestCase):
@@ -121,15 +121,15 @@ def test_flush_output(self, select_connection_class_mock):
             connection = blocking_connection.BlockingConnection('params')
 
         get_buffer_size_mock = mock.Mock(
-            name='_adapter_get_write_buffer_size',
+            name='_get_write_buffer_size',
             side_effect=[100, 50, 0],
             spec=nbio_interface.AbstractStreamTransport.get_write_buffer_size)
 
         transport_mock = mock.NonCallableMock(
             spec_set=nbio_interface.AbstractStreamTransport)
 
         connection._impl._transport = transport_mock
-        connection._impl._adapter_get_write_buffer_size = get_buffer_size_mock
+        connection._impl._get_write_buffer_size = get_buffer_size_mock
 
         connection._flush_output(lambda: False, lambda: True)
 

diff --git a/tests/unit/heartbeat_tests.py b/tests/unit/heartbeat_tests.py
@@ -40,9 +40,6 @@ def remove_timeout(self, timeout_id):
     def _adapter_emit_data(self, data):
         raise NotImplementedError
 
-    def _adapter_get_write_buffer_size(self):
-        raise NotImplementedError
-
     def _adapter_add_callback_threadsafe(self, callback):
         raise NotImplementedError