openstack/oslo.messaging
Code Issues Proposed changes

Stop using oslotest.mockpatch

Browse Source 
This module has been deprecated in favor of fixtures.MockPatch.

Change-Id: Id60c1a35cc1ec832da1a459b19c43020987d0769
This commit is contained in:
Brant Knudson 2017-02-21 14:35:49 -06:00 committed by Davanum Srinivas (dims)
parent f9cba9bd09
commit 41fa1ac649
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,6 @@ import kombu
import kombu.transport.memory import kombu.transport.memory
from oslo_config import cfg from oslo_config import cfg
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
from oslotest import mockpatch
import testscenarios import testscenarios
import oslo_messaging import oslo_messaging
@ -952,9 +951,9 @@ class RpcKombuHATestCase(test_utils.BaseTestCase):
heartbeat_timeout_threshold=0, heartbeat_timeout_threshold=0,
group="oslo_messaging_rabbit") group="oslo_messaging_rabbit")
self.useFixture(mockpatch.Patch( self.useFixture(fixtures.MockPatch(
'kombu.connection.Connection.connection')) 'kombu.connection.Connection.connection'))
self.useFixture(mockpatch.Patch( self.useFixture(fixtures.MockPatch(
'kombu.connection.Connection.channel')) 'kombu.connection.Connection.channel'))
# starting from the first broker in the list # starting from the first broker in the list
@ -962,7 +961,7 @@ class RpcKombuHATestCase(test_utils.BaseTestCase):
self.connection = rabbit_driver.Connection(self.conf, url, self.connection = rabbit_driver.Connection(self.conf, url,
driver_common.PURPOSE_SEND) driver_common.PURPOSE_SEND)
self.kombu_connect = mock.Mock() self.kombu_connect = mock.Mock()
self.useFixture(mockpatch.Patch( self.useFixture(fixtures.MockPatch(
'kombu.connection.Connection.connect', 'kombu.connection.Connection.connect',
side_effect=self.kombu_connect)) side_effect=self.kombu_connect))
self.addCleanup(self.connection.close) self.addCleanup(self.connection.close)