From 8e210c2bc2edc59e1b4aa18d17190351999f8934 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Thu, 19 Mar 2015 12:31:03 -0400 Subject: [PATCH] don't use oslo.messaging in mock using oslo.messaging in mock raises an import deprecation warning, and will eventually break. Change-Id: I4f2331fac3e1be2385e5cd0787432ed33e40c9f3 --- nova/tests/unit/conductor/test_conductor.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nova/tests/unit/conductor/test_conductor.py b/nova/tests/unit/conductor/test_conductor.py index e04d4a17cf5c..766b30920a7d 100644 --- a/nova/tests/unit/conductor/test_conductor.py +++ b/nova/tests/unit/conductor/test_conductor.py @@ -890,7 +890,7 @@ class ConductorRPCAPITestCase(_BaseTestCase, test.TestCase): 'event', ['arg']) @mock.patch.object(db, 'service_update') - @mock.patch('oslo.messaging.RPCClient.prepare') + @mock.patch('oslo_messaging.RPCClient.prepare') def test_service_update_time_big(self, mock_prepare, mock_update): CONF.set_override('report_interval', 10) services = {'id': 1} @@ -898,7 +898,7 @@ class ConductorRPCAPITestCase(_BaseTestCase, test.TestCase): mock_prepare.assert_called_once_with(timeout=9) @mock.patch.object(db, 'service_update') - @mock.patch('oslo.messaging.RPCClient.prepare') + @mock.patch('oslo_messaging.RPCClient.prepare') def test_service_update_time_small(self, mock_prepare, mock_update): CONF.set_override('report_interval', 3) services = {'id': 1} @@ -906,7 +906,7 @@ class ConductorRPCAPITestCase(_BaseTestCase, test.TestCase): mock_prepare.assert_called_once_with(timeout=3) @mock.patch.object(db, 'service_update') - @mock.patch('oslo.messaging.RPCClient.prepare') + @mock.patch('oslo_messaging.RPCClient.prepare') def test_service_update_no_time(self, mock_prepare, mock_update): CONF.set_override('report_interval', None) services = {'id': 1}