From 346c4248e4cf667674accae0d999b473be1f0486 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Fri, 1 Mar 2013 15:46:06 +0100 Subject: [PATCH] Remove old configuration metering_storage_engine This is useless now. Change-Id: I195cc626a6ae2d65535362c67f53663551933f9e Signed-off-by: Julien Danjou --- ceilometer/tests/db.py | 1 - tests/storage/test_impl_log.py | 1 - tests/storage/test_register_opts.py | 1 - 3 files changed, 3 deletions(-) diff --git a/ceilometer/tests/db.py b/ceilometer/tests/db.py index d3bba7c428..97e94e9f2e 100644 --- a/ceilometer/tests/db.py +++ b/ceilometer/tests/db.py @@ -38,7 +38,6 @@ class TestBase(test_base.TestCase): def setUp(self): super(TestBase, self).setUp() self.conf = mock.Mock() - self.conf.metering_storage_engine = 'mongodb' self.conf.database_connection = 'mongodb://localhost/%s' % self.DBNAME self.conn = TestConnection(self.conf) self.conn.drop_database(self.DBNAME) diff --git a/tests/storage/test_impl_log.py b/tests/storage/test_impl_log.py index a0e1dde3ec..100c66eac3 100644 --- a/tests/storage/test_impl_log.py +++ b/tests/storage/test_impl_log.py @@ -25,7 +25,6 @@ from ceilometer.storage import impl_log def test_get_connection(): conf = mox.Mox().CreateMockAnything() - conf.metering_storage_engine = 'log' log_stg = impl_log.LogStorage() conn = log_stg.get_connection(conf) conn.record_metering_data({'counter_name': 'test', diff --git a/tests/storage/test_register_opts.py b/tests/storage/test_register_opts.py index 3a5df5a956..da4c606a69 100644 --- a/tests/storage/test_register_opts.py +++ b/tests/storage/test_register_opts.py @@ -32,7 +32,6 @@ class RegisterOpts(test_base.TestCase): def test_register_opts(self): self.stubs.Set(storage, 'get_engine', self.faux_get_engine) - cfg.CONF.metering_storage_engine = 'log' self._faux_engine = self.mox.CreateMock(base.StorageEngine) self._faux_engine.register_opts(cfg.CONF) self.mox.ReplayAll()