Merge "unit tests: address TODO in base test case"

Author: Zuul

cinder/tests/unit/test.py

@@ -34,7 +34,6 @@
 from oslo_config import fixture as config_fixture
 from oslo_log.fixture import logging_error as log_fixture
 import oslo_messaging
-from oslo_messaging._drivers import impl_fake as fake_msging
 from oslo_messaging import conffixture as messaging_conffixture
 from oslo_serialization import jsonutils
 from oslo_utils import strutils
@@ -201,9 +200,6 @@ def setUp(self):
         rpc.add_extra_exmods("cinder.tests.unit")
         self.addCleanup(rpc.clear_extra_exmods)
         self.addCleanup(rpc.cleanup)
-        # TODO: Remove line after comment once the oslo.messaging fix merges
-        #       https://review.opendev.org/c/openstack/oslo.messaging/+/901018
-        self.addCleanup(fake_msging.FakeExchangeManager._exchanges.clear)
 
         self.messaging_conf = messaging_conffixture.ConfFixture(CONF)
         self.messaging_conf.transport_url = 'fake:/'

requirements.txt

@@ -16,7 +16,7 @@ oslo.concurrency>=4.5.0 # Apache-2.0
 oslo.context>=3.4.0 # Apache-2.0
 oslo.db>=11.0.0 # Apache-2.0
 oslo.log>=4.6.1 # Apache-2.0
-oslo.messaging>=14.1.0 # Apache-2.0
+oslo.messaging>=14.6.0 # Apache-2.0
 oslo.middleware>=4.1.1 # Apache-2.0
 oslo.policy>=4.5.0 # Apache-2.0
 oslo.privsep>=2.6.2 # Apache-2.0