Merge pull request #1276 from Zephor5/keep_with_origin_bh

ready return TwistedProtocolConnection instance as before

pika/adapters/twisted_connection.py

@@ -1200,6 +1200,11 @@ def channel(self, channel_number=None):  # pylint: disable=W0221
         d.addCallback(self._clear_call, d)
         return d.addCallback(TwistedChannel)
 
+    @property
+    def is_open(self):
+        # For compatibility with previous releases.
+        return self._impl.is_open
+
     @property
     def is_closed(self):
         # For compatibility with previous releases.
@@ -1232,6 +1237,7 @@ def makeConnection(self, transport):
     def connectionReady(self):
         """This method will be called when the underlying connection is ready.
         """
+        return self
 
     def _on_connection_ready(self, _connection):
         d, self.ready = self.ready, None

tests/acceptance/twisted_adapter_tests.py

@@ -11,6 +11,7 @@
 # pylint: disable=E1101
 
 """twisted adapter test"""
+import functools
 import unittest
 
 import mock
@@ -707,7 +708,7 @@ def test_on_connection_ready(self):
         d = self.conn.ready
         self.conn._on_connection_ready("testresult")
         self.assertTrue(d.called)
-        d.addCallback(self.assertIsNone)
+        d.addCallback(functools.partial(self.assertIsInstance, cls=TwistedProtocolConnection))
         return d
 
     def test_on_connection_ready_twice(self):