diff options
| -rw-r--r-- | oslo_messaging/_drivers/impl_rabbit.py | 1 | ||||
| -rw-r--r-- | oslo_messaging/tests/drivers/test_impl_rabbit.py | 13 |
2 files changed, 7 insertions, 7 deletions
diff --git a/oslo_messaging/_drivers/impl_rabbit.py b/oslo_messaging/_drivers/impl_rabbit.py index 437f2de..bba9008 100644 --- a/oslo_messaging/_drivers/impl_rabbit.py +++ b/oslo_messaging/_drivers/impl_rabbit.py @@ -685,6 +685,7 @@ class Connection(object): # NOTE(sileht): if purpose is PURPOSE_LISTEN # the consume code does the heartbeat stuff # we don't need a thread + self._heartbeat_thread = None if purpose == rpc_amqp.PURPOSE_SEND: self._heartbeat_start() diff --git a/oslo_messaging/tests/drivers/test_impl_rabbit.py b/oslo_messaging/tests/drivers/test_impl_rabbit.py index 3d81c70..eab73ab 100644 --- a/oslo_messaging/tests/drivers/test_impl_rabbit.py +++ b/oslo_messaging/tests/drivers/test_impl_rabbit.py @@ -200,13 +200,12 @@ class TestRabbitIterconsume(test_utils.BaseTestCase): 'kombu+memory:////') self.addCleanup(transport.cleanup) channel = mock.Mock() - conn = transport._driver._get_connection(amqp.PURPOSE_LISTEN - ).connection - conn.connection.recoverable_channel_errors = (IOError,) - with mock.patch.object(conn.connection, 'channel', - side_effect=[IOError, IOError, channel]): - conn.reset() - self.assertEqual(channel, conn.channel) + with transport._driver._get_connection(amqp.PURPOSE_LISTEN) as conn: + conn.connection.connection.recoverable_channel_errors = (IOError,) + with mock.patch.object(conn.connection.connection, 'channel', + side_effect=[IOError, IOError, channel]): + conn.connection.reset() + self.assertEqual(channel, conn.connection.channel) class TestRabbitTransportURL(test_utils.BaseTestCase): |