openstack/oslo.messaging
Code Issues Proposed changes

Merge "Bump kombu to 4.6.8"

Browse Source
This commit is contained in:
Zuul
2025-12-11 14:14:39 +00:00
committed by Gerrit Code Review
parent bd16d231be 591c4f59ae
commit 81658a283d
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
oslo_messaging/tests/drivers/test_impl_rabbit.py
View File

@@ -1105,19 +1105,15 @@ class RpcKombuHATestCase(test_utils.BaseTestCase):
'kombu.connection.Connection.connection'))
self.useFixture(fixtures.MockPatch(
'kombu.connection.Connection.channel'))
# TODO(stephenfin): Drop hasattr when we drop support for kombo < 4.6.8
if hasattr(kombu.connection.Connection, '_connection_factory'):
self.useFixture(fixtures.MockPatch(
'kombu.connection.Connection._connection_factory'))
self.useFixture(fixtures.MockPatch(
'kombu.connection.Connection._connection_factory'))
# starting from the first broker in the list
url = oslo_messaging.TransportURL.parse(self.conf, None)
self.connection = rabbit_driver.Connection(self.conf, url,
driver_common.PURPOSE_SEND)
# TODO(stephenfin): Remove when we drop support for kombo < 4.6.8
if hasattr(kombu.connection.Connection, 'connect'):
self.useFixture(fixtures.MockPatch(
'kombu.connection.Connection.connect'))
self.useFixture(fixtures.MockPatch(
'kombu.connection.Connection.connect'))
self.addCleanup(self.connection.close)
def test_ensure_four_retry(self):

2
requirements.txt
View File

@@ -25,7 +25,7 @@ PyYAML>=3.13 # MIT
# rabbit driver is the default
# we set the amqp version to ensure heartbeat works
amqp>=2.5.2 # BSD
kombu>=4.6.6 # BSD
kombu>=4.6.8 # BSD
# middleware
oslo.middleware>=3.31.0 # Apache-2.0