From d0b710c9cc8641e8475035f2881bc731a7dce1ea Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 15 Nov 2013 19:26:22 +0100 Subject: [PATCH] Replace mox with mock in tests.storage Change-Id: I912c999567eba012eb1777f937d1a5785a720d54 --- ceilometer/tests/storage/test_get_engine.py | 8 ++-- ceilometer/tests/storage/test_impl_hbase.py | 16 +++---- ceilometer/tests/storage/test_impl_log.py | 9 ++-- ceilometer/tests/storage/test_impl_mongodb.py | 47 +++++++++---------- .../tests/storage/test_storage_scenarios.py | 2 - 5 files changed, 37 insertions(+), 45 deletions(-) diff --git a/ceilometer/tests/storage/test_get_engine.py b/ceilometer/tests/storage/test_get_engine.py index 1ed20dca..a9cf660d 100644 --- a/ceilometer/tests/storage/test_get_engine.py +++ b/ceilometer/tests/storage/test_get_engine.py @@ -18,7 +18,7 @@ """Tests for ceilometer/storage/ """ -import mox +import mock from ceilometer.openstack.common import test from ceilometer import storage @@ -28,15 +28,13 @@ from ceilometer.storage import impl_log class EngineTest(test.BaseTestCase): def test_get_engine(self): - conf = mox.Mox().CreateMockAnything() - conf.database = mox.Mox().CreateMockAnything() + conf = mock.Mock() conf.database.connection = 'log://localhost' engine = storage.get_engine(conf) self.assertIsInstance(engine, impl_log.LogStorage) def test_get_engine_no_such_engine(self): - conf = mox.Mox().CreateMockAnything() - conf.database = mox.Mox().CreateMockAnything() + conf = mock.Mock() conf.database.connection = 'no-such-engine://localhost' try: storage.get_engine(conf) diff --git a/ceilometer/tests/storage/test_impl_hbase.py b/ceilometer/tests/storage/test_impl_hbase.py index 2783ab7a..13577e67 100644 --- a/ceilometer/tests/storage/test_impl_hbase.py +++ b/ceilometer/tests/storage/test_impl_hbase.py @@ -24,7 +24,8 @@ running the tests. Make sure the Thrift server is running on that server. """ -from ceilometer.openstack.common.fixture import moxstubout +from mock import patch + from ceilometer.storage.impl_hbase import Connection from ceilometer.storage.impl_hbase import MConnection from ceilometer.tests import db as tests_db @@ -36,10 +37,6 @@ class HBaseEngineTestBase(tests_db.TestBase): class ConnectionTest(HBaseEngineTestBase): - def setUp(self): - super(ConnectionTest, self).setUp() - self.stubs = self.useFixture(moxstubout.MoxStubout()).stubs - def test_hbase_connection(self): self.CONF.database.connection = self.database_connection conn = Connection(self.CONF) @@ -52,8 +49,11 @@ class ConnectionTest(HBaseEngineTestBase): def open(self): pass + def get_connection(conf): + return TestConn(conf['host'], conf['port']) + self.CONF.database.connection = 'hbase://test_hbase:9090' - self.stubs.Set(Connection, '_get_connection', - lambda self, x: TestConn(x['host'], x['port'])) - conn = Connection(self.CONF) + with patch.object(Connection, '_get_connection', + side_effect=get_connection): + conn = Connection(self.CONF) self.assertIsInstance(conn.conn, TestConn) diff --git a/ceilometer/tests/storage/test_impl_log.py b/ceilometer/tests/storage/test_impl_log.py index ef226e83..e2d3a6f0 100644 --- a/ceilometer/tests/storage/test_impl_log.py +++ b/ceilometer/tests/storage/test_impl_log.py @@ -18,18 +18,15 @@ """Tests for ceilometer/storage/impl_log.py """ -from ceilometer.openstack.common.fixture import moxstubout +import mock + from ceilometer.openstack.common import test from ceilometer.storage import impl_log class ConnectionTest(test.BaseTestCase): - def setUp(self): - super(ConnectionTest, self).setUp() - self.mox = self.useFixture(moxstubout.MoxStubout()).mox - def test_get_connection(self): - conf = self.mox.CreateMockAnything() + conf = mock.Mock() log_stg = impl_log.LogStorage() conn = log_stg.get_connection(conf) conn.record_metering_data({'counter_name': 'test', diff --git a/ceilometer/tests/storage/test_impl_mongodb.py b/ceilometer/tests/storage/test_impl_mongodb.py index 4eedd73b..5f3703be 100644 --- a/ceilometer/tests/storage/test_impl_mongodb.py +++ b/ceilometer/tests/storage/test_impl_mongodb.py @@ -26,6 +26,7 @@ import copy import datetime +from mock import patch from ceilometer.publisher import rpc from ceilometer import sample @@ -160,32 +161,30 @@ class CompatibilityTest(test_storage_scenarios.DBTestBase, record = copy.copy(data) self.db.meter.insert(record) - return # Stubout with the old version DB schema, the one w/o 'counter_unit' - self.stubs.Set(self.conn, - 'record_metering_data', - old_record_metering_data) - self.counters = [] - c = sample.Sample( - 'volume.size', - 'gauge', - 'GiB', - 5, - 'user-id', - 'project1', - 'resource-id', - timestamp=datetime.datetime(2012, 9, 25, 10, 30), - resource_metadata={'display_name': 'test-volume', - 'tag': 'self.counter', - }, - source='test', - ) - self.counters.append(c) - msg = rpc.meter_message_from_counter( - c, - secret='not-so-secret') - self.conn.record_metering_data(self.conn, msg) + with patch.object(self.conn, 'record_metering_data', + side_effect=old_record_metering_data): + self.counters = [] + c = sample.Sample( + 'volume.size', + 'gauge', + 'GiB', + 5, + 'user-id', + 'project1', + 'resource-id', + timestamp=datetime.datetime(2012, 9, 25, 10, 30), + resource_metadata={'display_name': 'test-volume', + 'tag': 'self.counter', + }, + source='test', + ) + self.counters.append(c) + msg = rpc.meter_message_from_counter( + c, + secret='not-so-secret') + self.conn.record_metering_data(self.conn, msg) # Create the old format alarm with a dict instead of a # array for matching_metadata diff --git a/ceilometer/tests/storage/test_storage_scenarios.py b/ceilometer/tests/storage/test_storage_scenarios.py index c07a6ae8..a56bd22a 100644 --- a/ceilometer/tests/storage/test_storage_scenarios.py +++ b/ceilometer/tests/storage/test_storage_scenarios.py @@ -23,7 +23,6 @@ import datetime import testscenarios -from ceilometer.openstack.common.fixture import moxstubout from ceilometer.openstack.common import timeutils from ceilometer.publisher import rpc from ceilometer import sample @@ -60,7 +59,6 @@ class DBTestBase(tests_db.TestBase): def setUp(self): super(DBTestBase, self).setUp() - self.stubs = self.useFixture(moxstubout.MoxStubout()).stubs self.prepare_data() def tearDown(self):