diff --git a/masakari/test.py b/masakari/test.py index 1222eb06..9ff30a81 100644 --- a/masakari/test.py +++ b/masakari/test.py @@ -32,7 +32,6 @@ import testtools from oslo_config import cfg from oslo_log import log as logging -from oslotest import moxstubout from masakari.tests import fixtures as masakari_fixtures from masakari.tests.unit import conf_fixture @@ -89,9 +88,6 @@ class TestCase(testtools.TestCase): super(TestCase, self).setUp() self.useFixture(conf_fixture.ConfFixture(CONF)) - mox_fixture = self.useFixture(moxstubout.MoxStubout()) - self.mox = mox_fixture.mox - self.stubs = mox_fixture.stubs self.policy = self.useFixture(policy_fixture.PolicyFixture()) if self.USES_DB: diff --git a/masakari/tests/unit/api/openstack/test_wsgi.py b/masakari/tests/unit/api/openstack/test_wsgi.py index ea74e98c..b5907509 100644 --- a/masakari/tests/unit/api/openstack/test_wsgi.py +++ b/masakari/tests/unit/api/openstack/test_wsgi.py @@ -27,7 +27,6 @@ from masakari.api.openstack import extensions from masakari.api.openstack import wsgi from masakari.api import versioned_method from masakari import exception -from masakari import i18n from masakari import test from masakari.tests.unit.api.openstack import fakes from masakari.tests.unit import matchers @@ -68,8 +67,8 @@ class RequestTest(MicroversionedTest): self.assertEqual(result, "application/json") def test_from_request(self): - self.stubs.Set(i18n, 'get_available_languages', - fakes.fake_get_available_languages) + self.stub_out('masakari.i18n.get_available_languages', + fakes.fake_get_available_languages) request = wsgi.Request.blank('/') accepted = 'bogus;q=1.1, en-gb;q=0.7,en-us,en;q=.5,*;q=.7' @@ -79,8 +78,8 @@ class RequestTest(MicroversionedTest): def test_asterisk(self): # asterisk should match first available if there # are not any other available matches - self.stubs.Set(i18n, 'get_available_languages', - fakes.fake_get_available_languages) + self.stub_out('masakari.i18n.get_available_languages', + fakes.fake_get_available_languages) request = wsgi.Request.blank('/') accepted = '*,es;q=.5' @@ -88,8 +87,8 @@ class RequestTest(MicroversionedTest): self.assertEqual(request.best_match_language(), 'en_GB') def test_prefix(self): - self.stubs.Set(i18n, 'get_available_languages', - fakes.fake_get_available_languages) + self.stub_out('masakari.i18n.get_available_languages', + fakes.fake_get_available_languages) request = wsgi.Request.blank('/') accepted = 'zh' @@ -97,8 +96,8 @@ class RequestTest(MicroversionedTest): self.assertEqual(request.best_match_language(), 'zh_CN') def test_secondary(self): - self.stubs.Set(i18n, 'get_available_languages', - fakes.fake_get_available_languages) + self.stub_out('masakari.i18n.get_available_languages', + fakes.fake_get_available_languages) request = wsgi.Request.blank('/') accepted = 'nn,en-gb;q=.5' @@ -106,8 +105,8 @@ class RequestTest(MicroversionedTest): self.assertEqual(request.best_match_language(), 'en_GB') def test_none_found(self): - self.stubs.Set(i18n, 'get_available_languages', - fakes.fake_get_available_languages) + self.stub_out('masakari.i18n.get_available_languages', + fakes.fake_get_available_languages) request = wsgi.Request.blank('/') accepted = 'nb-no' @@ -115,8 +114,8 @@ class RequestTest(MicroversionedTest): self.assertIsNone(request.best_match_language()) def test_no_lang_header(self): - self.stubs.Set(i18n, 'get_available_languages', - fakes.fake_get_available_languages) + self.stub_out('masakari.i18n.get_available_languages', + fakes.fake_get_available_languages) request = wsgi.Request.blank('/') accepted = '' diff --git a/masakari/tests/unit/test_service.py b/masakari/tests/unit/test_service.py index 180179e9..04609ee1 100644 --- a/masakari/tests/unit/test_service.py +++ b/masakari/tests/unit/test_service.py @@ -17,10 +17,7 @@ Unit Tests for remote procedure calls using queue """ -import sys - import mock -from mox3 import mox from oslo_concurrency import processutils from oslo_config import cfg from oslo_service import service as _service @@ -30,7 +27,6 @@ from masakari import manager from masakari import rpc from masakari import service from masakari import test -from masakari import wsgi CONF = cfg.CONF @@ -83,33 +79,26 @@ class ServiceTestCase(test.NoDBTestCase): "test_service.FakeManager>" self.assertEqual(exp, repr(serv)) + @mock.patch.object(_service.Service, 'stop') @mock.patch.object(rpc, 'init') @mock.patch.object(rpc, 'get_server') - def test_parent_graceful_shutdown(self, mock_rpc, mock_rpc_init): - self.manager_mock = self.mox.CreateMock(FakeManager) - self.mox.StubOutWithMock(sys.modules[__name__], - 'FakeManager', use_mock_anything=True) - - self.mox.StubOutWithMock(_service.Service, 'stop') - - FakeManager(host=self.host).AndReturn(self.manager_mock) - - self.manager_mock.service_name = self.topic - - _service.Service.stop() - - self.mox.ReplayAll() - + def test_parent_graceful_shutdown(self, mock_rpc, mock_rpc_init, + mock_stop): serv = service.Service(self.host, self.binary, self.topic, 'masakari.tests.unit.test_service.FakeManager') + + serv.manager = mock.Mock() + serv.manager.service_name = self.topic + serv.start() serv.stop() serv.rpcserver.start.assert_called_once_with() serv.rpcserver.stop.assert_called_once_with() + mock_stop.assert_called_once_with() @mock.patch.object(rpc, 'init') def test_reset(self, mock_rpc_init): @@ -126,7 +115,7 @@ class TestWSGIService(test.NoDBTestCase): def setUp(self): super(TestWSGIService, self).setUp() - self.stubs.Set(wsgi.Loader, "load_app", mox.MockAnything()) + self.stub_out('masakari.wsgi.Loader.load_app', mock.MagicMock()) def test_workers_set_default(self): test_service = service.WSGIService("masakari_api")