Merge pull request #1172 from lukebakken/pika-1106

Remove _adapter_get_write_buffer_size from Connection

pika/adapters/base_connection.py

@@ -400,16 +400,6 @@ def _adapter_emit_data(self, data):
         """
         self._transport.write(data)
 
-    def _adapter_get_write_buffer_size(self):
-        """
-        Subclasses must override this
-
-        :return: Current size of output data buffered by the transport
-        :rtype: int
-
-        """
-        return self._transport.get_write_buffer_size()
-
     def _proto_connection_made(self, transport):
         """Introduces transport to protocol after transport is connected.
 

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

pika/adapters/select_connection.py

@@ -137,6 +137,13 @@ def connection_factory(params):
             workflow=workflow,
             on_done=on_done)
 
+    def _get_write_buffer_size(self):
+        """
+        :return: Current size of output data buffered by the transport
+        :rtype: int
+        """
+        return self._transport.get_write_buffer_size()
+
 
 class _Timeout(object):
     """Represents a timeout"""

pika/adapters/twisted_connection.py

@@ -1147,15 +1147,6 @@ def _adapter_emit_data(self, data):
         """
         self._transport.write(data)
 
-    def _adapter_get_write_buffer_size(self):
-        """Implement pure virtual
-        :py:ref:meth:`pika.connection.Connection._adapter_emit_data()` method.
-
-        This method only belongs in SelectConnection, no others need it
-        and twisted transport doesn't expose it.
-        """
-        raise NotImplementedError
-
     def connection_made(self, transport):
         """Introduces transport to protocol after transport is connected.
 

pika/connection.py

@@ -1459,17 +1459,6 @@ def _adapter_emit_data(self, data):
         """
         raise NotImplementedError
 
-    @abc.abstractmethod
-    def _adapter_get_write_buffer_size(self):
-        """
-        Subclasses must override this
-
-        :return: Current size of output data buffered by the transport
-        :rtype: int
-
-        """
-        raise NotImplementedError
-
     def _add_channel_callbacks(self, channel_number):
         """Add the appropriate callbacks for the specified channel number.
 

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)
 

tests/unit/channel_tests.py

@@ -30,8 +30,6 @@ class ConnectionTemplate(connection.Connection):
     _adapter_connect_stream = connection.Connection._adapter_connect_stream
     _adapter_disconnect_stream = connection.Connection._adapter_disconnect_stream
     _adapter_emit_data = connection.Connection._adapter_emit_data
-    _adapter_get_write_buffer_size = (
-        connection.Connection._adapter_get_write_buffer_size)
     _adapter_add_timeout = connection.Connection._adapter_add_timeout
     _adapter_remove_timeout = connection.Connection._adapter_remove_timeout
     _adapter_add_callback_threadsafe = (

tests/unit/connection_tests.py

@@ -56,9 +56,6 @@ def _adapter_add_callback_threadsafe(self, callback):
     def _adapter_emit_data(self, data):
         raise NotImplementedError
 
-    def _adapter_get_write_buffer_size(self):
-        raise NotImplementedError
-
 
 class ConnectionTests(unittest.TestCase):  # pylint: disable=R0904
     def setUp(self):
@@ -947,14 +944,8 @@ def test_blocked_connection_on_stream_terminated_removes_timer(
         ConstructibleConnection,
         '_adapter_emit_data',
         spec_set=connection.Connection._adapter_emit_data)
-    @mock.patch.object(
-        ConstructibleConnection,
-        '_adapter_get_write_buffer_size',
-        spec_set=connection.Connection._adapter_get_write_buffer_size,
-        return_value = 1000)
     def test_send_message_updates_frames_sent_and_bytes_sent(
             self,
-            _adapter_get_write_buffer_size,
             _adapter_emit_data):
         self.connection._flush_outbound = mock.Mock()
         self.connection._body_max_length = 10000

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