Merge pull request #1041 from vitaly-krugl/issue-1036-fix-heartbeat-c…

…heckter-active

Fixed access to non-existent attribute Connection.heartbeat in HeartbeatChecker.active property getter

README.rst

@@ -12,9 +12,9 @@ extensions.
 - Python 2.7 and 3.4+ are supported.
 
 - Since threads aren't appropriate to every situation, it doesn't
-  require threads. It takes care not to forbid them, either. The same
-  goes for greenlets, callbacks, continuations and generators. It is
-  not necessarily thread-safe however, and your mileage will vary.
+  require threads. Pika core takes care not to forbid them, either. The same
+  goes for greenlets, callbacks, continuations, and generators. An instance of
+  Pika's built-in connection adapters is not thread-safe, however.
 
 - People may be using direct sockets, plain old `select()`,
   or any of the wide variety of ways of getting network events to and from a

pika/heartbeat.py

@@ -50,7 +50,7 @@ def active(self):
         :rtype True
 
         """
-        return self._connection.heartbeat is self
+        return self._connection._heartbeat_checker is self
 
     @property
     def bytes_received_on_connection(self):

tests/unit/heartbeat_tests.py

@@ -20,15 +20,39 @@
 # pylint: disable=C0103
 
 
+class ConstructableConnection(connection.Connection):
+    """Adds dummy overrides for `Connection`'s abstract methods so
+    that we can instantiate and test it.
+
+    """
+    def _adapter_connect_stream(self):
+        pass
+
+    def _adapter_disconnect_stream(self):
+        raise NotImplementedError
+
+    def add_timeout(self, deadline, callback):
+        raise NotImplementedError
+
+    def remove_timeout(self, timeout_id):
+        raise NotImplementedError
+
+    def _adapter_emit_data(self, data):
+        raise NotImplementedError
+
+    def _adapter_get_write_buffer_size(self):
+        raise NotImplementedError
+
+
 class HeartbeatTests(unittest.TestCase):
 
     INTERVAL = 5
 
     def setUp(self):
-        self.mock_conn = mock.Mock(spec=connection.Connection)
+        self.mock_conn = mock.Mock(spec_set=ConstructableConnection())
         self.mock_conn.bytes_received = 100
         self.mock_conn.bytes_sent = 100
-        self.mock_conn.heartbeat = mock.Mock(spec=heartbeat.HeartbeatChecker)
+        self.mock_conn._heartbeat_checker = mock.Mock(spec=heartbeat.HeartbeatChecker)
         self.obj = heartbeat.HeartbeatChecker(self.mock_conn, self.INTERVAL)
 
     def tearDown(self):
@@ -65,11 +89,11 @@ def test_constructor_called_setup_timer(self, timer):
         timer.assert_called_once_with()
 
     def test_active_true(self):
-        self.mock_conn.heartbeat = self.obj
+        self.mock_conn._heartbeat_checker = self.obj
         self.assertTrue(self.obj.active)
 
     def test_active_false(self):
-        self.mock_conn.heartbeat = mock.Mock()
+        self.mock_conn._heartbeat_checker = mock.Mock()
         self.assertFalse(self.obj.active)
 
     def test_bytes_received_on_connection(self):
@@ -178,7 +202,7 @@ def test_start_timer_not_active(self, setup_timer):
 
     @mock.patch('pika.heartbeat.HeartbeatChecker._setup_timer')
     def test_start_timer_active(self, setup_timer):
-        self.mock_conn.heartbeat = self.obj
+        self.mock_conn._heartbeat_checker = self.obj
         self.obj._start_timer()
         self.assertTrue(setup_timer.called)