From b6e01687af8901a845978a337c0b9553e3777a59 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Tue, 19 Aug 2014 17:42:02 +0200 Subject: [PATCH] Switch to oslotest Change-Id: I8fb8755f289521b928b1dee2605d310e788f73c7 --- .../openstack/common/fixture/__init__.py | 0 ceilometer/openstack/common/fixture/config.py | 85 ---------------- .../openstack/common/fixture/lockutils.py | 51 ---------- .../openstack/common/fixture/logging.py | 34 ------- .../openstack/common/fixture/mockpatch.py | 62 ------------ .../openstack/common/fixture/moxstubout.py | 43 -------- ceilometer/openstack/common/test.py | 99 ------------------- ceilometer/tests/agentbase.py | 6 +- ceilometer/tests/alarm/evaluator/base.py | 5 +- ceilometer/tests/alarm/evaluator/test_base.py | 4 +- .../alarm/partition/test_coordination.py | 4 +- ceilometer/tests/alarm/test_notifier.py | 8 +- .../tests/alarm/test_partitioned_alarm_svc.py | 4 +- ceilometer/tests/alarm/test_rpc.py | 8 +- .../tests/alarm/test_singleton_alarm_svc.py | 4 +- ceilometer/tests/api/__init__.py | 4 +- ceilometer/tests/api/test_app.py | 4 +- ceilometer/tests/api/v2/test_complex_query.py | 6 +- .../api/v2/test_post_samples_scenarios.py | 2 +- ceilometer/tests/api/v2/test_query.py | 8 +- ceilometer/tests/api/v2/test_statistics.py | 5 +- .../tests/api/v2/test_wsme_custom_type.py | 5 +- ceilometer/tests/base.py | 6 +- ceilometer/tests/central/test_manager.py | 6 +- .../tests/compute/notifications/test_cpu.py | 5 +- .../compute/notifications/test_instance.py | 4 +- ceilometer/tests/compute/pollsters/base.py | 2 +- .../pollsters/test_location_metadata.py | 4 +- ceilometer/tests/compute/test_manager.py | 6 +- .../compute/virt/hyperv/test_inspector.py | 4 +- .../tests/compute/virt/hyperv/test_utilsv2.py | 4 +- .../compute/virt/libvirt/test_inspector.py | 6 +- .../compute/virt/vmware/test_inspector.py | 4 +- .../virt/vmware/test_vsphere_operations.py | 4 +- .../data_processing/test_notifications.py | 4 +- ceilometer/tests/db.py | 8 +- ceilometer/tests/dispatcher/test_db.py | 8 +- ceilometer/tests/dispatcher/test_file.py | 9 +- ceilometer/tests/energy/test_kwapi.py | 14 +-- ceilometer/tests/event/test_endpoint.py | 4 +- ceilometer/tests/event/test_trait_plugins.py | 6 +- .../tests/hardware/inspector/test_snmp.py | 2 +- .../tests/hardware/notifications/test_ipmi.py | 4 +- .../tests/identity/test_notifications.py | 6 +- ceilometer/tests/image/test_glance.py | 12 +-- ceilometer/tests/image/test_notifications.py | 4 +- .../tests/network/services/test_fwaas.py | 6 +- .../tests/network/services/test_lbaas.py | 6 +- .../tests/network/services/test_vpnaas.py | 6 +- .../tests/network/statistics/__init__.py | 4 +- .../statistics/opencontrail/test_client.py | 4 +- .../statistics/opencontrail/test_driver.py | 4 +- .../statistics/opendaylight/test_client.py | 4 +- .../statistics/opendaylight/test_driver.py | 4 +- .../tests/network/statistics/test_driver.py | 4 +- .../network/statistics/test_statistics.py | 7 +- ceilometer/tests/network/test_floatingip.py | 4 +- ceilometer/tests/objectstore/test_swift.py | 6 +- .../objectstore/test_swift_middleware.py | 6 +- .../tests/orchestration/test_notifications.py | 4 +- ceilometer/tests/pipeline_base.py | 6 +- .../tests/profiler/test_notifications.py | 4 +- ceilometer/tests/publisher/test_file.py | 5 +- .../tests/publisher/test_rpc_publisher.py | 4 +- ceilometer/tests/publisher/test_udp.py | 8 +- ceilometer/tests/publisher/test_utils.py | 4 +- .../tests/storage/sqlalchemy/test_models.py | 4 +- ceilometer/tests/storage/test_base.py | 5 +- .../tests/storage/test_get_connection.py | 10 +- ceilometer/tests/storage/test_impl_log.py | 4 +- ceilometer/tests/storage/test_models.py | 7 +- ceilometer/tests/test_collector.py | 6 +- ceilometer/tests/test_messaging.py | 9 +- ceilometer/tests/test_middleware.py | 7 +- ceilometer/tests/test_neutronclient.py | 4 +- ceilometer/tests/test_notification.py | 6 +- ceilometer/tests/test_notifier.py | 4 +- ceilometer/tests/test_novaclient.py | 12 +-- ceilometer/tests/test_plugin.py | 8 +- ceilometer/tests/test_utils.py | 5 +- ceilometer/tests/volume/test_notifications.py | 4 +- nova_tests/test_notifier.py | 11 +-- openstack-common.conf | 1 - requirements-py3.txt | 2 +- requirements.txt | 2 +- 85 files changed, 211 insertions(+), 587 deletions(-) delete mode 100644 ceilometer/openstack/common/fixture/__init__.py delete mode 100644 ceilometer/openstack/common/fixture/config.py delete mode 100644 ceilometer/openstack/common/fixture/lockutils.py delete mode 100644 ceilometer/openstack/common/fixture/logging.py delete mode 100644 ceilometer/openstack/common/fixture/mockpatch.py delete mode 100644 ceilometer/openstack/common/fixture/moxstubout.py delete mode 100644 ceilometer/openstack/common/test.py diff --git a/ceilometer/openstack/common/fixture/__init__.py b/ceilometer/openstack/common/fixture/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/ceilometer/openstack/common/fixture/config.py b/ceilometer/openstack/common/fixture/config.py deleted file mode 100644 index 9489b85a5..000000000 --- a/ceilometer/openstack/common/fixture/config.py +++ /dev/null @@ -1,85 +0,0 @@ -# -# Copyright 2013 Mirantis, Inc. -# Copyright 2013 OpenStack Foundation -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -import fixtures -from oslo.config import cfg -import six - - -class Config(fixtures.Fixture): - """Allows overriding configuration settings for the test. - - `conf` will be reset on cleanup. - - """ - - def __init__(self, conf=cfg.CONF): - self.conf = conf - - def setUp(self): - super(Config, self).setUp() - # NOTE(morganfainberg): unregister must be added to cleanup before - # reset is because cleanup works in reverse order of registered items, - # and a reset must occur before unregistering options can occur. - self.addCleanup(self._unregister_config_opts) - self.addCleanup(self.conf.reset) - self._registered_config_opts = {} - - def config(self, **kw): - """Override configuration values. - - The keyword arguments are the names of configuration options to - override and their values. - - If a `group` argument is supplied, the overrides are applied to - the specified configuration option group, otherwise the overrides - are applied to the ``default`` group. - - """ - - group = kw.pop('group', None) - for k, v in six.iteritems(kw): - self.conf.set_override(k, v, group) - - def _unregister_config_opts(self): - for group in self._registered_config_opts: - self.conf.unregister_opts(self._registered_config_opts[group], - group=group) - - def register_opt(self, opt, group=None): - """Register a single option for the test run. - - Options registered in this manner will automatically be unregistered - during cleanup. - - If a `group` argument is supplied, it will register the new option - to that group, otherwise the option is registered to the ``default`` - group. - """ - self.conf.register_opt(opt, group=group) - self._registered_config_opts.setdefault(group, set()).add(opt) - - def register_opts(self, opts, group=None): - """Register multiple options for the test run. - - This works in the same manner as register_opt() but takes a list of - options as the first argument. All arguments will be registered to the - same group if the ``group`` argument is supplied, otherwise all options - will be registered to the ``default`` group. - """ - for opt in opts: - self.register_opt(opt, group=group) diff --git a/ceilometer/openstack/common/fixture/lockutils.py b/ceilometer/openstack/common/fixture/lockutils.py deleted file mode 100644 index 0c11625c6..000000000 --- a/ceilometer/openstack/common/fixture/lockutils.py +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2011 OpenStack Foundation. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -import fixtures - -from ceilometer.openstack.common import lockutils - - -class LockFixture(fixtures.Fixture): - """External locking fixture. - - This fixture is basically an alternative to the synchronized decorator with - the external flag so that tearDowns and addCleanups will be included in - the lock context for locking between tests. The fixture is recommended to - be the first line in a test method, like so:: - - def test_method(self): - self.useFixture(LockFixture) - ... - - or the first line in setUp if all the test methods in the class are - required to be serialized. Something like:: - - class TestCase(testtools.testcase): - def setUp(self): - self.useFixture(LockFixture) - super(TestCase, self).setUp() - ... - - This is because addCleanups are put on a LIFO queue that gets run after the - test method exits. (either by completing or raising an exception) - """ - def __init__(self, name, lock_file_prefix=None): - self.mgr = lockutils.lock(name, lock_file_prefix, True) - - def setUp(self): - super(LockFixture, self).setUp() - self.addCleanup(self.mgr.__exit__, None, None, None) - self.lock = self.mgr.__enter__() diff --git a/ceilometer/openstack/common/fixture/logging.py b/ceilometer/openstack/common/fixture/logging.py deleted file mode 100644 index 3823a0355..000000000 --- a/ceilometer/openstack/common/fixture/logging.py +++ /dev/null @@ -1,34 +0,0 @@ -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -import fixtures - - -def get_logging_handle_error_fixture(): - """returns a fixture to make logging raise formatting exceptions. - - Usage: - self.useFixture(logging.get_logging_handle_error_fixture()) - """ - return fixtures.MonkeyPatch('logging.Handler.handleError', - _handleError) - - -def _handleError(self, record): - """Monkey patch for logging.Handler.handleError. - - The default handleError just logs the error to stderr but we want - the option of actually raising an exception. - """ - raise diff --git a/ceilometer/openstack/common/fixture/mockpatch.py b/ceilometer/openstack/common/fixture/mockpatch.py deleted file mode 100644 index ab2dc0216..000000000 --- a/ceilometer/openstack/common/fixture/mockpatch.py +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 2010 United States Government as represented by the -# Administrator of the National Aeronautics and Space Administration. -# Copyright 2013 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -############################################################################## -############################################################################## -# -# DO NOT MODIFY THIS FILE -# -# This file is being graduated to the oslotest library. Please make all -# changes there, and only backport critical fixes here. - dhellmann -# -############################################################################## -############################################################################## - -import fixtures -import mock - - -class PatchObject(fixtures.Fixture): - """Deal with code around mock.""" - - def __init__(self, obj, attr, new=mock.DEFAULT, **kwargs): - self.obj = obj - self.attr = attr - self.kwargs = kwargs - self.new = new - - def setUp(self): - super(PatchObject, self).setUp() - _p = mock.patch.object(self.obj, self.attr, self.new, **self.kwargs) - self.mock = _p.start() - self.addCleanup(_p.stop) - - -class Patch(fixtures.Fixture): - - """Deal with code around mock.patch.""" - - def __init__(self, obj, new=mock.DEFAULT, **kwargs): - self.obj = obj - self.kwargs = kwargs - self.new = new - - def setUp(self): - super(Patch, self).setUp() - _p = mock.patch(self.obj, self.new, **self.kwargs) - self.mock = _p.start() - self.addCleanup(_p.stop) diff --git a/ceilometer/openstack/common/fixture/moxstubout.py b/ceilometer/openstack/common/fixture/moxstubout.py deleted file mode 100644 index d92c9626d..000000000 --- a/ceilometer/openstack/common/fixture/moxstubout.py +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 2010 United States Government as represented by the -# Administrator of the National Aeronautics and Space Administration. -# Copyright 2013 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -############################################################################## -############################################################################## -# -# DO NOT MODIFY THIS FILE -# -# This file is being graduated to the oslotest library. Please make all -# changes there, and only backport critical fixes here. - dhellmann -# -############################################################################## -############################################################################## - -import fixtures -from six.moves import mox - - -class MoxStubout(fixtures.Fixture): - """Deal with code around mox and stubout as a fixture.""" - - def setUp(self): - super(MoxStubout, self).setUp() - # emulate some of the mox stuff, we can't use the metaclass - # because it screws with our generators - self.mox = mox.Mox() - self.stubs = self.mox.stubs - self.addCleanup(self.mox.UnsetStubs) - self.addCleanup(self.mox.VerifyAll) diff --git a/ceilometer/openstack/common/test.py b/ceilometer/openstack/common/test.py deleted file mode 100644 index 394d89b57..000000000 --- a/ceilometer/openstack/common/test.py +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright (c) 2013 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -############################################################################## -############################################################################## -## -## DO NOT MODIFY THIS FILE -## -## This file is being graduated to the ceilometertest library. Please make all -## changes there, and only backport critical fixes here. - dhellmann -## -############################################################################## -############################################################################## - -"""Common utilities used in testing""" - -import logging -import os -import tempfile - -import fixtures -import testtools - -_TRUE_VALUES = ('True', 'true', '1', 'yes') -_LOG_FORMAT = "%(levelname)8s [%(name)s] %(message)s" - - -class BaseTestCase(testtools.TestCase): - - def setUp(self): - super(BaseTestCase, self).setUp() - self._set_timeout() - self._fake_output() - self._fake_logs() - self.useFixture(fixtures.NestedTempfile()) - self.useFixture(fixtures.TempHomeDir()) - self.tempdirs = [] - - def _set_timeout(self): - test_timeout = os.environ.get('OS_TEST_TIMEOUT', 0) - try: - test_timeout = int(test_timeout) - except ValueError: - # If timeout value is invalid do not set a timeout. - test_timeout = 0 - if test_timeout > 0: - self.useFixture(fixtures.Timeout(test_timeout, gentle=True)) - - def _fake_output(self): - if os.environ.get('OS_STDOUT_CAPTURE') in _TRUE_VALUES: - stdout = self.useFixture(fixtures.StringStream('stdout')).stream - self.useFixture(fixtures.MonkeyPatch('sys.stdout', stdout)) - if os.environ.get('OS_STDERR_CAPTURE') in _TRUE_VALUES: - stderr = self.useFixture(fixtures.StringStream('stderr')).stream - self.useFixture(fixtures.MonkeyPatch('sys.stderr', stderr)) - - def _fake_logs(self): - if os.environ.get('OS_DEBUG') in _TRUE_VALUES: - level = logging.DEBUG - else: - level = logging.INFO - capture_logs = os.environ.get('OS_LOG_CAPTURE') in _TRUE_VALUES - if capture_logs: - self.useFixture( - fixtures.FakeLogger( - format=_LOG_FORMAT, - level=level, - nuke_handlers=capture_logs, - ) - ) - else: - logging.basicConfig(format=_LOG_FORMAT, level=level) - - def create_tempfiles(self, files, ext='.conf'): - tempfiles = [] - for (basename, contents) in files: - if not os.path.isabs(basename): - (fd, path) = tempfile.mkstemp(prefix=basename, suffix=ext) - else: - path = basename + ext - fd = os.open(path, os.O_CREAT | os.O_WRONLY) - tempfiles.append(path) - try: - os.write(fd, contents) - finally: - os.close(fd) - return tempfiles diff --git a/ceilometer/tests/agentbase.py b/ceilometer/tests/agentbase.py index d7f1abd6b..9956f5cd3 100644 --- a/ceilometer/tests/agentbase.py +++ b/ceilometer/tests/agentbase.py @@ -25,11 +25,11 @@ import copy import datetime import mock +from oslo.config import fixture as fixture_config +from oslotest import mockpatch import six from stevedore import extension -from ceilometer.openstack.common.fixture import config -from ceilometer.openstack.common.fixture import mockpatch from ceilometer import pipeline from ceilometer import plugin from ceilometer import publisher @@ -231,7 +231,7 @@ class BaseAgentManagerTestCase(base.BaseTestCase): 'publishers': ["test"], }, ] self.setup_pipeline() - self.CONF = self.useFixture(config.Config()).conf + self.CONF = self.useFixture(fixture_config.Config()).conf self.CONF.set_override( 'pipeline_cfg_file', self.path_get('etc/ceilometer/pipeline.yaml') diff --git a/ceilometer/tests/alarm/evaluator/base.py b/ceilometer/tests/alarm/evaluator/base.py index e3c28b83c..fb450a84b 100644 --- a/ceilometer/tests/alarm/evaluator/base.py +++ b/ceilometer/tests/alarm/evaluator/base.py @@ -18,11 +18,10 @@ """Base class for tests in ceilometer/alarm/evaluator/ """ import mock - -from ceilometer.openstack.common import test +from oslotest import base -class TestEvaluatorBase(test.BaseTestCase): +class TestEvaluatorBase(base.BaseTestCase): def setUp(self): super(TestEvaluatorBase, self).setUp() self.api_client = mock.Mock() diff --git a/ceilometer/tests/alarm/evaluator/test_base.py b/ceilometer/tests/alarm/evaluator/test_base.py index 1aa6f24a2..634997981 100644 --- a/ceilometer/tests/alarm/evaluator/test_base.py +++ b/ceilometer/tests/alarm/evaluator/test_base.py @@ -18,13 +18,13 @@ """ import datetime import mock +from oslotest import base from ceilometer.alarm import evaluator -from ceilometer.openstack.common import test from ceilometer.openstack.common import timeutils -class TestEvaluatorBaseClass(test.BaseTestCase): +class TestEvaluatorBaseClass(base.BaseTestCase): def setUp(self): super(TestEvaluatorBaseClass, self).setUp() self.called = False diff --git a/ceilometer/tests/alarm/partition/test_coordination.py b/ceilometer/tests/alarm/partition/test_coordination.py index dda07c8d3..242855a7d 100644 --- a/ceilometer/tests/alarm/partition/test_coordination.py +++ b/ceilometer/tests/alarm/partition/test_coordination.py @@ -21,11 +21,11 @@ import logging import uuid import mock +from oslo.config import fixture as fixture_config from six import moves from ceilometer.alarm.partition import coordination from ceilometer.alarm.storage import models -from ceilometer.openstack.common.fixture import config from ceilometer.openstack.common import timeutils from ceilometer.tests import base as tests_base @@ -51,7 +51,7 @@ class MockLoggingHandler(logging.Handler): class TestCoordinate(tests_base.BaseTestCase): def setUp(self): super(TestCoordinate, self).setUp() - self.CONF = self.useFixture(config.Config()).conf + self.CONF = self.useFixture(fixture_config.Config()).conf self.setup_messaging(self.CONF) self.test_interval = 120 diff --git a/ceilometer/tests/alarm/test_notifier.py b/ceilometer/tests/alarm/test_notifier.py index 9ef1d5480..e5f668470 100644 --- a/ceilometer/tests/alarm/test_notifier.py +++ b/ceilometer/tests/alarm/test_notifier.py @@ -1,5 +1,5 @@ # -# Copyright 2013 eNovance +# Copyright 2013-2014 eNovance # # Author: Julien Danjou # @@ -17,13 +17,13 @@ import anyjson import mock +from oslo.config import fixture as fixture_config +from oslotest import mockpatch import requests import six.moves.urllib.parse as urlparse from ceilometer.alarm import service from ceilometer.openstack.common import context -from ceilometer.openstack.common.fixture import config -from ceilometer.openstack.common.fixture import mockpatch from ceilometer.tests import base as tests_base @@ -44,7 +44,7 @@ class TestAlarmNotifier(tests_base.BaseTestCase): def setUp(self): super(TestAlarmNotifier, self).setUp() - self.CONF = self.useFixture(config.Config()).conf + self.CONF = self.useFixture(fixture_config.Config()).conf self.setup_messaging(self.CONF) self.service = service.AlarmNotifierService() self.useFixture(mockpatch.Patch( diff --git a/ceilometer/tests/alarm/test_partitioned_alarm_svc.py b/ceilometer/tests/alarm/test_partitioned_alarm_svc.py index 38b850916..52d820b32 100644 --- a/ceilometer/tests/alarm/test_partitioned_alarm_svc.py +++ b/ceilometer/tests/alarm/test_partitioned_alarm_svc.py @@ -18,10 +18,10 @@ """ import contextlib import mock +from oslo.config import fixture as fixture_config from stevedore import extension from ceilometer.alarm import service -from ceilometer.openstack.common.fixture import config from ceilometer.tests import base as tests_base @@ -31,7 +31,7 @@ class TestPartitionedAlarmService(tests_base.BaseTestCase): self.threshold_eval = mock.Mock() self.api_client = mock.MagicMock() - self.CONF = self.useFixture(config.Config()).conf + self.CONF = self.useFixture(fixture_config.Config()).conf self.CONF.set_override('host', 'fake_host') diff --git a/ceilometer/tests/alarm/test_rpc.py b/ceilometer/tests/alarm/test_rpc.py index 3b2867611..0e73000de 100644 --- a/ceilometer/tests/alarm/test_rpc.py +++ b/ceilometer/tests/alarm/test_rpc.py @@ -1,5 +1,5 @@ # -# Copyright 2013 eNovance +# Copyright 2013-2014 eNovance # # Authors: Mehdi Abaakouk # @@ -19,12 +19,12 @@ import uuid from ceilometerclient.v2 import alarms import eventlet +from oslo.config import fixture as fixture_config import six from ceilometer.alarm import rpc as rpc_alarm from ceilometer.alarm.storage import models from ceilometer import messaging -from ceilometer.openstack.common.fixture import config from ceilometer.openstack.common import timeutils from ceilometer.tests import base as tests_base @@ -48,7 +48,7 @@ class FakeNotifier(object): class TestRPCAlarmNotifier(tests_base.BaseTestCase): def setUp(self): super(TestRPCAlarmNotifier, self).setUp() - self.CONF = self.useFixture(config.Config()).conf + self.CONF = self.useFixture(fixture_config.Config()).conf self.setup_messaging(self.CONF) self.notifier_server = FakeNotifier(self.transport) @@ -169,7 +169,7 @@ class FakeCoordinator(object): class TestRPCAlarmPartitionCoordination(tests_base.BaseTestCase): def setUp(self): super(TestRPCAlarmPartitionCoordination, self).setUp() - self.CONF = self.useFixture(config.Config()).conf + self.CONF = self.useFixture(fixture_config.Config()).conf self.setup_messaging(self.CONF) self.coordinator_server = FakeCoordinator(self.transport) diff --git a/ceilometer/tests/alarm/test_singleton_alarm_svc.py b/ceilometer/tests/alarm/test_singleton_alarm_svc.py index 7b16c143c..8f12b9b9e 100644 --- a/ceilometer/tests/alarm/test_singleton_alarm_svc.py +++ b/ceilometer/tests/alarm/test_singleton_alarm_svc.py @@ -17,17 +17,17 @@ """Tests for ceilometer.alarm.service.SingletonAlarmService. """ import mock +from oslo.config import fixture as fixture_config from stevedore import extension from ceilometer.alarm import service -from ceilometer.openstack.common.fixture import config from ceilometer.tests import base as tests_base class TestSingletonAlarmService(tests_base.BaseTestCase): def setUp(self): super(TestSingletonAlarmService, self).setUp() - self.CONF = self.useFixture(config.Config()).conf + self.CONF = self.useFixture(fixture_config.Config()).conf self.setup_messaging(self.CONF) self.threshold_eval = mock.Mock() diff --git a/ceilometer/tests/api/__init__.py b/ceilometer/tests/api/__init__.py index 07022de2c..997a4aa0a 100644 --- a/ceilometer/tests/api/__init__.py +++ b/ceilometer/tests/api/__init__.py @@ -18,10 +18,10 @@ """ from oslo.config import cfg +from oslo.config import fixture as fixture_config import pecan import pecan.testing -from ceilometer.openstack.common.fixture import config from ceilometer.tests import db as db_test_base OPT_GROUP_NAME = 'keystone_authtoken' @@ -40,7 +40,7 @@ class FunctionalTest(db_test_base.TestBase): def setUp(self): super(FunctionalTest, self).setUp() - self.CONF = self.useFixture(config.Config()).conf + self.CONF = self.useFixture(fixture_config.Config()).conf self.setup_messaging(self.CONF) self.CONF.set_override("auth_version", "v2.0", diff --git a/ceilometer/tests/api/test_app.py b/ceilometer/tests/api/test_app.py index b7d9b5eb1..94e5fe1ce 100644 --- a/ceilometer/tests/api/test_app.py +++ b/ceilometer/tests/api/test_app.py @@ -18,9 +18,9 @@ import socket from oslo.config import cfg +from oslo.config import fixture as fixture_config from ceilometer.api import app -from ceilometer.openstack.common.fixture import config from ceilometer.tests import base @@ -28,7 +28,7 @@ class TestApp(base.BaseTestCase): def setUp(self): super(TestApp, self).setUp() - self.CONF = self.useFixture(config.Config()).conf + self.CONF = self.useFixture(fixture_config.Config()).conf def test_WSGI_address_family(self): self.CONF.set_override('host', '::', group='api') diff --git a/ceilometer/tests/api/v2/test_complex_query.py b/ceilometer/tests/api/v2/test_complex_query.py index a52e760d2..ccea9d171 100644 --- a/ceilometer/tests/api/v2/test_complex_query.py +++ b/ceilometer/tests/api/v2/test_complex_query.py @@ -21,11 +21,11 @@ import datetime import fixtures import jsonschema import mock +from oslotest import base import wsme from ceilometer.alarm.storage import models as alarm_models from ceilometer.api.controllers import v2 as api -from ceilometer.openstack.common import test from ceilometer.storage import models @@ -46,7 +46,7 @@ sample_name_mapping = {"resource": "resource_id", "volume": "counter_volume"} -class TestComplexQuery(test.BaseTestCase): +class TestComplexQuery(base.BaseTestCase): def setUp(self): super(TestComplexQuery, self).setUp() self.useFixture(fixtures.MonkeyPatch( @@ -234,7 +234,7 @@ class TestComplexQuery(test.BaseTestCase): orderby) -class TestFilterSyntaxValidation(test.BaseTestCase): +class TestFilterSyntaxValidation(base.BaseTestCase): def setUp(self): super(TestFilterSyntaxValidation, self).setUp() self.query = FakeComplexQuery(models.Sample, diff --git a/ceilometer/tests/api/v2/test_post_samples_scenarios.py b/ceilometer/tests/api/v2/test_post_samples_scenarios.py index 576484968..05be04208 100644 --- a/ceilometer/tests/api/v2/test_post_samples_scenarios.py +++ b/ceilometer/tests/api/v2/test_post_samples_scenarios.py @@ -21,8 +21,8 @@ import copy import datetime import mock +from oslotest import mockpatch -from ceilometer.openstack.common.fixture import mockpatch from ceilometer.openstack.common import timeutils from ceilometer.tests.api import v2 from ceilometer.tests import db as tests_db diff --git a/ceilometer/tests/api/v2/test_query.py b/ceilometer/tests/api/v2/test_query.py index 6c7a56aa7..6d428e8f1 100644 --- a/ceilometer/tests/api/v2/test_query.py +++ b/ceilometer/tests/api/v2/test_query.py @@ -18,17 +18,17 @@ import datetime import fixtures import mock +from oslotest import base +from oslotest import mockpatch import wsme from ceilometer.api.controllers import v2 as api -from ceilometer.openstack.common.fixture import mockpatch -from ceilometer.openstack.common import test from ceilometer.openstack.common import timeutils from ceilometer import storage from ceilometer.tests import base as tests_base -class TestQuery(test.BaseTestCase): +class TestQuery(base.BaseTestCase): def setUp(self): super(TestQuery, self).setUp() self.useFixture(fixtures.MonkeyPatch( @@ -143,7 +143,7 @@ class TestQuery(test.BaseTestCase): self.assertEqual(expected, query._get_value_as_type()) -class TestValidateGroupByFields(test.BaseTestCase): +class TestValidateGroupByFields(base.BaseTestCase): def test_valid_field(self): result = api._validate_groupby_fields(['user_id']) diff --git a/ceilometer/tests/api/v2/test_statistics.py b/ceilometer/tests/api/v2/test_statistics.py index 0e56f7fa8..a0fa2d435 100644 --- a/ceilometer/tests/api/v2/test_statistics.py +++ b/ceilometer/tests/api/v2/test_statistics.py @@ -18,11 +18,12 @@ import datetime +from oslotest import base + from ceilometer.api.controllers import v2 -from ceilometer.openstack.common import test -class TestStatisticsDuration(test.BaseTestCase): +class TestStatisticsDuration(base.BaseTestCase): def setUp(self): super(TestStatisticsDuration, self).setUp() diff --git a/ceilometer/tests/api/v2/test_wsme_custom_type.py b/ceilometer/tests/api/v2/test_wsme_custom_type.py index fbd81d186..6a80054b1 100644 --- a/ceilometer/tests/api/v2/test_wsme_custom_type.py +++ b/ceilometer/tests/api/v2/test_wsme_custom_type.py @@ -14,14 +14,13 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - +from oslotest import base import wsme from ceilometer.api.controllers import v2 -from ceilometer.openstack.common import test -class TestWsmeCustomType(test.BaseTestCase): +class TestWsmeCustomType(base.BaseTestCase): def test_advenum_default(self): class dummybase(wsme.types.Base): diff --git a/ceilometer/tests/base.py b/ceilometer/tests/base.py index 3c022a7ab..9fe7f3d39 100644 --- a/ceilometer/tests/base.py +++ b/ceilometer/tests/base.py @@ -22,16 +22,16 @@ import os.path import eventlet import oslo.messaging.conffixture +from oslotest import base +from oslotest import mockpatch import six from testtools import testcase from ceilometer import messaging -from ceilometer.openstack.common.fixture import mockpatch -from ceilometer.openstack.common import test from ceilometer.openstack.common import timeutils -class BaseTestCase(test.BaseTestCase): +class BaseTestCase(base.BaseTestCase): def setup_messaging(self, conf, exchange=None): self.useFixture(oslo.messaging.conffixture.ConfFixture(conf)) conf.set_override("notification_driver", "messaging") diff --git a/ceilometer/tests/central/test_manager.py b/ceilometer/tests/central/test_manager.py index af1116c4c..2dcc5320c 100644 --- a/ceilometer/tests/central/test_manager.py +++ b/ceilometer/tests/central/test_manager.py @@ -18,17 +18,17 @@ """ import mock +from oslotest import base +from oslotest import mockpatch from stevedore import extension from ceilometer.central import manager from ceilometer.central import plugin -from ceilometer.openstack.common.fixture import mockpatch -from ceilometer.openstack.common import test from ceilometer import pipeline from ceilometer.tests import agentbase -class TestManager(test.BaseTestCase): +class TestManager(base.BaseTestCase): @mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock()) def test_load_plugins(self): diff --git a/ceilometer/tests/compute/notifications/test_cpu.py b/ceilometer/tests/compute/notifications/test_cpu.py index 300636adb..c72695d5b 100644 --- a/ceilometer/tests/compute/notifications/test_cpu.py +++ b/ceilometer/tests/compute/notifications/test_cpu.py @@ -20,8 +20,9 @@ notification events. import copy +from oslotest import base + from ceilometer.compute.notifications import cpu -from ceilometer.openstack.common import test METRICS_UPDATE = { @@ -88,7 +89,7 @@ RES_ID = '%s_%s' % (METRICS_UPDATE['payload']['host'], METRICS_UPDATE['payload']['nodename']) -class TestMetricsNotifications(test.BaseTestCase): +class TestMetricsNotifications(base.BaseTestCase): def _process_notification(self, ic): self.assertIn(METRICS_UPDATE['event_type'], ic.event_types) diff --git a/ceilometer/tests/compute/notifications/test_instance.py b/ceilometer/tests/compute/notifications/test_instance.py index ee2d7d04f..7b928a03c 100644 --- a/ceilometer/tests/compute/notifications/test_instance.py +++ b/ceilometer/tests/compute/notifications/test_instance.py @@ -19,9 +19,9 @@ """Tests for converters for producing compute counter messages from notification events. """ +from oslotest import base from ceilometer.compute.notifications import instance -from ceilometer.openstack.common import test from ceilometer import sample @@ -593,7 +593,7 @@ INSTANCE_SCHEDULED = { } -class TestNotifications(test.BaseTestCase): +class TestNotifications(base.BaseTestCase): def test_process_notification(self): info = list(instance.Instance(None).process_notification( diff --git a/ceilometer/tests/compute/pollsters/base.py b/ceilometer/tests/compute/pollsters/base.py index a9afc64f9..7858f60ca 100644 --- a/ceilometer/tests/compute/pollsters/base.py +++ b/ceilometer/tests/compute/pollsters/base.py @@ -18,8 +18,8 @@ # under the License. import mock +from oslotest import mockpatch -from ceilometer.openstack.common.fixture import mockpatch import ceilometer.tests.base as base diff --git a/ceilometer/tests/compute/pollsters/test_location_metadata.py b/ceilometer/tests/compute/pollsters/test_location_metadata.py index 4ee57df54..4241076ae 100644 --- a/ceilometer/tests/compute/pollsters/test_location_metadata.py +++ b/ceilometer/tests/compute/pollsters/test_location_metadata.py @@ -20,11 +20,11 @@ """ import mock +from oslotest import base import six from ceilometer.compute import manager from ceilometer.compute.pollsters import util -from ceilometer.openstack.common import test class FauxInstance(object): @@ -43,7 +43,7 @@ class FauxInstance(object): return default -class TestLocationMetadata(test.BaseTestCase): +class TestLocationMetadata(base.BaseTestCase): @mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock()) def setUp(self): diff --git a/ceilometer/tests/compute/test_manager.py b/ceilometer/tests/compute/test_manager.py index e8f60aece..99aa6b4d8 100644 --- a/ceilometer/tests/compute/test_manager.py +++ b/ceilometer/tests/compute/test_manager.py @@ -17,16 +17,16 @@ """Tests for ceilometer/agent/manager.py """ import mock +from oslotest import base +from oslotest import mockpatch from ceilometer import agent from ceilometer.compute import manager from ceilometer import nova_client -from ceilometer.openstack.common.fixture import mockpatch -from ceilometer.openstack.common import test from ceilometer.tests import agentbase -class TestManager(test.BaseTestCase): +class TestManager(base.BaseTestCase): @mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock()) def test_load_plugins(self): diff --git a/ceilometer/tests/compute/virt/hyperv/test_inspector.py b/ceilometer/tests/compute/virt/hyperv/test_inspector.py index 9850734b2..6402cd59a 100644 --- a/ceilometer/tests/compute/virt/hyperv/test_inspector.py +++ b/ceilometer/tests/compute/virt/hyperv/test_inspector.py @@ -18,13 +18,13 @@ Tests for Hyper-V inspector. """ import mock +from oslotest import base from ceilometer.compute.virt.hyperv import inspector as hyperv_inspector -from ceilometer.openstack.common import test from ceilometer.openstack.common import units -class TestHyperVInspection(test.BaseTestCase): +class TestHyperVInspection(base.BaseTestCase): def setUp(self): self._inspector = hyperv_inspector.HyperVInspector() diff --git a/ceilometer/tests/compute/virt/hyperv/test_utilsv2.py b/ceilometer/tests/compute/virt/hyperv/test_utilsv2.py index 458a11c29..a58c65b87 100644 --- a/ceilometer/tests/compute/virt/hyperv/test_utilsv2.py +++ b/ceilometer/tests/compute/virt/hyperv/test_utilsv2.py @@ -18,13 +18,13 @@ Tests for Hyper-V utilsv2. """ import mock +from oslotest import base from ceilometer.compute.virt.hyperv import utilsv2 as utilsv2 from ceilometer.compute.virt import inspector -from ceilometer.openstack.common import test -class TestUtilsV2(test.BaseTestCase): +class TestUtilsV2(base.BaseTestCase): _FAKE_RETURN_CLASS = 'fake_return_class' diff --git a/ceilometer/tests/compute/virt/libvirt/test_inspector.py b/ceilometer/tests/compute/virt/libvirt/test_inspector.py index 0df73da35..7162a1c18 100644 --- a/ceilometer/tests/compute/virt/libvirt/test_inspector.py +++ b/ceilometer/tests/compute/virt/libvirt/test_inspector.py @@ -22,13 +22,13 @@ import contextlib import fixtures import mock +from oslotest import base from ceilometer.compute.virt import inspector as virt_inspector from ceilometer.compute.virt.libvirt import inspector as libvirt_inspector -from ceilometer.openstack.common import test -class TestLibvirtInspection(test.BaseTestCase): +class TestLibvirtInspection(base.BaseTestCase): def setUp(self): super(TestLibvirtInspection, self).setUp() @@ -246,7 +246,7 @@ class TestLibvirtInspection(test.BaseTestCase): self.assertEqual(disks, []) -class TestLibvirtInspectionWithError(test.BaseTestCase): +class TestLibvirtInspectionWithError(base.BaseTestCase): class fakeLibvirtError(Exception): pass diff --git a/ceilometer/tests/compute/virt/vmware/test_inspector.py b/ceilometer/tests/compute/virt/vmware/test_inspector.py index 6c6dd0cb0..94c78389c 100644 --- a/ceilometer/tests/compute/virt/vmware/test_inspector.py +++ b/ceilometer/tests/compute/virt/vmware/test_inspector.py @@ -18,13 +18,13 @@ Tests for VMware Vsphere inspector. import mock from oslo.vmware import api +from oslotest import base from ceilometer.compute.virt import inspector as virt_inspector from ceilometer.compute.virt.vmware import inspector as vsphere_inspector -from ceilometer.openstack.common import test -class TestVsphereInspection(test.BaseTestCase): +class TestVsphereInspection(base.BaseTestCase): def setUp(self): api_session = api.VMwareAPISession("test_server", "test_user", diff --git a/ceilometer/tests/compute/virt/vmware/test_vsphere_operations.py b/ceilometer/tests/compute/virt/vmware/test_vsphere_operations.py index c81dfb00d..50076267a 100644 --- a/ceilometer/tests/compute/virt/vmware/test_vsphere_operations.py +++ b/ceilometer/tests/compute/virt/vmware/test_vsphere_operations.py @@ -15,12 +15,12 @@ import mock from oslo.vmware import api +from oslotest import base from ceilometer.compute.virt.vmware import vsphere_operations -from ceilometer.openstack.common import test -class VsphereOperationsTest(test.BaseTestCase): +class VsphereOperationsTest(base.BaseTestCase): def setUp(self): api_session = api.VMwareAPISession("test_server", "test_user", diff --git a/ceilometer/tests/data_processing/test_notifications.py b/ceilometer/tests/data_processing/test_notifications.py index 9a7f787eb..9ee25eb4d 100644 --- a/ceilometer/tests/data_processing/test_notifications.py +++ b/ceilometer/tests/data_processing/test_notifications.py @@ -17,10 +17,10 @@ import datetime import mock from oslo.config import cfg +from oslotest import base from ceilometer.data_processing import notifications from ceilometer.openstack.common import log -from ceilometer.openstack.common import test from ceilometer import sample NOW = datetime.datetime.isoformat(datetime.datetime.utcnow()) @@ -71,7 +71,7 @@ def _dp_notification_for(operation): } -class TestNotification(test.BaseTestCase): +class TestNotification(base.BaseTestCase): def _verify_common_sample(self, actual, operation): self.assertIsNotNone(actual) self.assertEqual('cluster.%s' % operation, actual.name) diff --git a/ceilometer/tests/db.py b/ceilometer/tests/db.py index 544feca6b..2823b82b1 100644 --- a/ceilometer/tests/db.py +++ b/ceilometer/tests/db.py @@ -23,13 +23,13 @@ import os import uuid import warnings +from oslo.config import fixture as fixture_config +from oslotest import mockpatch import six from six.moves.urllib import parse as urlparse import testscenarios.testcase from testtools import testcase -from ceilometer.openstack.common.fixture import config -import ceilometer.openstack.common.fixture.mockpatch as oslo_mock from ceilometer import storage from ceilometer.tests import base as test_base @@ -125,10 +125,10 @@ class TestBase(testscenarios.testcase.WithScenarios, test_base.BaseTestCase): self.alarm_conn = self.db_manager.alarm_connection self.alarm_conn.upgrade() - self.useFixture(oslo_mock.Patch('ceilometer.storage.get_connection', + self.useFixture(mockpatch.Patch('ceilometer.storage.get_connection', side_effect=self._get_connection)) - self.CONF = self.useFixture(config.Config()).conf + self.CONF = self.useFixture(fixture_config.Config()).conf self.CONF([], project='ceilometer') # Set a default location for the pipeline config file so the diff --git a/ceilometer/tests/dispatcher/test_db.py b/ceilometer/tests/dispatcher/test_db.py index 9fab137c5..dcd8750de 100644 --- a/ceilometer/tests/dispatcher/test_db.py +++ b/ceilometer/tests/dispatcher/test_db.py @@ -17,18 +17,18 @@ import datetime import mock +from oslo.config import fixture as fixture_config +from oslotest import base from ceilometer.dispatcher import database -from ceilometer.openstack.common.fixture import config -from ceilometer.openstack.common import test from ceilometer.publisher import utils -class TestDispatcherDB(test.BaseTestCase): +class TestDispatcherDB(base.BaseTestCase): def setUp(self): super(TestDispatcherDB, self).setUp() - self.CONF = self.useFixture(config.Config()).conf + self.CONF = self.useFixture(fixture_config.Config()).conf self.CONF.set_override('connection', 'sqlite://', group='database') self.dispatcher = database.DatabaseDispatcher(self.CONF) self.ctx = None diff --git a/ceilometer/tests/dispatcher/test_file.py b/ceilometer/tests/dispatcher/test_file.py index 2f49d9dc0..bdb6f181f 100644 --- a/ceilometer/tests/dispatcher/test_file.py +++ b/ceilometer/tests/dispatcher/test_file.py @@ -18,17 +18,18 @@ import logging.handlers import os import tempfile +from oslo.config import fixture as fixture_config +from oslotest import base + from ceilometer.dispatcher import file -from ceilometer.openstack.common.fixture import config -from ceilometer.openstack.common import test from ceilometer.publisher import utils -class TestDispatcherFile(test.BaseTestCase): +class TestDispatcherFile(base.BaseTestCase): def setUp(self): super(TestDispatcherFile, self).setUp() - self.CONF = self.useFixture(config.Config()).conf + self.CONF = self.useFixture(fixture_config.Config()).conf def test_file_dispatcher_with_all_config(self): # Create a temporaryFile to get a file name diff --git a/ceilometer/tests/energy/test_kwapi.py b/ceilometer/tests/energy/test_kwapi.py index 62a75fda5..938ac3dbb 100644 --- a/ceilometer/tests/energy/test_kwapi.py +++ b/ceilometer/tests/energy/test_kwapi.py @@ -18,13 +18,13 @@ import datetime from keystoneclient import exceptions import mock +from oslotest import base +from oslotest import mockpatch import six from ceilometer.central import manager from ceilometer.energy import kwapi from ceilometer.openstack.common import context -from ceilometer.openstack.common.fixture import mockpatch -from ceilometer.openstack.common import test PROBE_DICT = { @@ -55,7 +55,7 @@ class TestManager(manager.AgentManager): self.keystone = mock.Mock() -class TestKwapi(test.BaseTestCase): +class TestKwapi(base.BaseTestCase): @mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock()) def setUp(self): @@ -76,7 +76,7 @@ class TestKwapi(test.BaseTestCase): self.assertEqual(0, len(samples)) -class TestEnergyPollster(test.BaseTestCase): +class TestEnergyPollster(base.BaseTestCase): @mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock()) def setUp(self): @@ -114,7 +114,7 @@ class TestEnergyPollster(test.BaseTestCase): # power_samples))) -class TestEnergyPollsterCache(test.BaseTestCase): +class TestEnergyPollsterCache(base.BaseTestCase): @mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock()) def setUp(self): @@ -136,7 +136,7 @@ class TestEnergyPollsterCache(test.BaseTestCase): self.assertEqual(1, len(samples)) -class TestPowerPollster(test.BaseTestCase): +class TestPowerPollster(base.BaseTestCase): @mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock()) def setUp(self): @@ -171,7 +171,7 @@ class TestPowerPollster(test.BaseTestCase): self.assertEqual(probe['w'], sample.volume) -class TestPowerPollsterCache(test.BaseTestCase): +class TestPowerPollsterCache(base.BaseTestCase): @mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock()) def setUp(self): diff --git a/ceilometer/tests/event/test_endpoint.py b/ceilometer/tests/event/test_endpoint.py index 15b3330a6..3ffe07212 100644 --- a/ceilometer/tests/event/test_endpoint.py +++ b/ceilometer/tests/event/test_endpoint.py @@ -18,11 +18,11 @@ import mock from oslo.config import cfg +from oslo.config import fixture as fixture_config import oslo.messaging from stevedore import extension from ceilometer.event import endpoint as event_endpoint -from ceilometer.openstack.common.fixture import config from ceilometer.storage import models from ceilometer.tests import base as tests_base @@ -86,7 +86,7 @@ class TestEventEndpoint(tests_base.BaseTestCase): def setUp(self): super(TestEventEndpoint, self).setUp() - self.CONF = self.useFixture(config.Config()).conf + self.CONF = self.useFixture(fixture_config.Config()).conf self.CONF([]) self.CONF.set_override("connection", "log://", group='database') self.CONF.set_override("store_events", True, group="notification") diff --git a/ceilometer/tests/event/test_trait_plugins.py b/ceilometer/tests/event/test_trait_plugins.py index 8899833b9..c25c430e5 100644 --- a/ceilometer/tests/event/test_trait_plugins.py +++ b/ceilometer/tests/event/test_trait_plugins.py @@ -14,12 +14,12 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. +from oslotest import base from ceilometer.event import trait_plugins -from ceilometer.openstack.common import test -class TestSplitterPlugin(test.BaseTestCase): +class TestSplitterPlugin(base.BaseTestCase): def setUp(self): super(TestSplitterPlugin, self).setUp() @@ -66,7 +66,7 @@ class TestSplitterPlugin(test.BaseTestCase): self.assertIs(None, value) -class TestBitfieldPlugin(test.BaseTestCase): +class TestBitfieldPlugin(base.BaseTestCase): def setUp(self): super(TestBitfieldPlugin, self).setUp() diff --git a/ceilometer/tests/hardware/inspector/test_snmp.py b/ceilometer/tests/hardware/inspector/test_snmp.py index 26ce2fdac..1d2b052e1 100644 --- a/ceilometer/tests/hardware/inspector/test_snmp.py +++ b/ceilometer/tests/hardware/inspector/test_snmp.py @@ -16,9 +16,9 @@ # under the License. """Tests for ceilometer/hardware/inspector/snmp/inspector.py """ +from oslotest import mockpatch from ceilometer.hardware.inspector import snmp -from ceilometer.openstack.common.fixture import mockpatch from ceilometer.openstack.common import network_utils from ceilometer.tests import base as test_base from ceilometer.tests.hardware.inspector import base diff --git a/ceilometer/tests/hardware/notifications/test_ipmi.py b/ceilometer/tests/hardware/notifications/test_ipmi.py index c1d7070cd..ea85278a3 100644 --- a/ceilometer/tests/hardware/notifications/test_ipmi.py +++ b/ceilometer/tests/hardware/notifications/test_ipmi.py @@ -18,14 +18,14 @@ """ import mock +from oslotest import base from ceilometer.hardware.notifications import ipmi -from ceilometer.openstack.common import test from ceilometer import sample from ceilometer.tests.hardware.notifications import ipmi_test_data -class TestNotifications(test.BaseTestCase): +class TestNotifications(base.BaseTestCase): def test_ipmi_temperature_notification(self): """Test IPMI Temperature sensor data. diff --git a/ceilometer/tests/identity/test_notifications.py b/ceilometer/tests/identity/test_notifications.py index 1bd72ec80..93c2dcda4 100644 --- a/ceilometer/tests/identity/test_notifications.py +++ b/ceilometer/tests/identity/test_notifications.py @@ -13,9 +13,9 @@ import datetime import mock +from oslotest import base from ceilometer.identity import notifications -from ceilometer.openstack.common import test from ceilometer import sample @@ -80,7 +80,7 @@ def authn_notification_for(outcome): } -class TestCRUDNotification(test.BaseTestCase): +class TestCRUDNotification(base.BaseTestCase): def _verify_common_sample(self, s): self.assertIsNotNone(s) @@ -148,7 +148,7 @@ class TestCRUDNotification(test.BaseTestCase): self._test_operation('trust', 'deleted', TRUST_ID, notifications.Trust) -class TestAuthenticationNotification(test.BaseTestCase): +class TestAuthenticationNotification(base.BaseTestCase): def _verify_common_sample(self, s): self.assertIsNotNone(s) diff --git a/ceilometer/tests/image/test_glance.py b/ceilometer/tests/image/test_glance.py index 37dbd6819..702fc69b0 100644 --- a/ceilometer/tests/image/test_glance.py +++ b/ceilometer/tests/image/test_glance.py @@ -16,13 +16,13 @@ # under the License. import mock +from oslo.config import fixture as fixture_config +from oslotest import base +from oslotest import mockpatch from ceilometer.central import manager from ceilometer.image import glance from ceilometer.openstack.common import context -from ceilometer.openstack.common.fixture import config -from ceilometer.openstack.common.fixture import mockpatch -from ceilometer.openstack.common import test IMAGE_LIST = [ type('Image', (object,), @@ -121,7 +121,7 @@ class TestManager(manager.AgentManager): self.keystone = mock.Mock() -class TestImagePollsterPageSize(test.BaseTestCase): +class TestImagePollsterPageSize(base.BaseTestCase): def fake_get_glance_client(self, ksclient): glanceclient = FakeGlanceClient() @@ -136,7 +136,7 @@ class TestImagePollsterPageSize(test.BaseTestCase): self.useFixture(mockpatch.PatchObject( glance._Base, 'get_glance_client', side_effect=self.fake_get_glance_client)) - self.CONF = self.useFixture(config.Config()).conf + self.CONF = self.useFixture(fixture_config.Config()).conf def _do_test_iter_images(self, page_size=0): self.CONF.set_override("glance_page_size", page_size) @@ -159,7 +159,7 @@ class TestImagePollsterPageSize(test.BaseTestCase): self._do_test_iter_images(-1) -class TestImagePollster(test.BaseTestCase): +class TestImagePollster(base.BaseTestCase): def fake_get_glance_client(self, ksclient): glanceclient = _BaseObject() diff --git a/ceilometer/tests/image/test_notifications.py b/ceilometer/tests/image/test_notifications.py index 5896fba0e..cbbb49685 100644 --- a/ceilometer/tests/image/test_notifications.py +++ b/ceilometer/tests/image/test_notifications.py @@ -19,9 +19,9 @@ import datetime import mock +from oslotest import base from ceilometer.image import notifications -from ceilometer.openstack.common import test from ceilometer import sample @@ -90,7 +90,7 @@ NOTIFICATION_DELETE = {"message_id": "0c65cb9c-018c-11e2-bc91-5453ed1bbb5f", "timestamp": NOW} -class TestNotification(test.BaseTestCase): +class TestNotification(base.BaseTestCase): def _verify_common_counter(self, c, name, volume): self.assertIsNotNone(c) diff --git a/ceilometer/tests/network/services/test_fwaas.py b/ceilometer/tests/network/services/test_fwaas.py index 23b47be9d..904cd6489 100644 --- a/ceilometer/tests/network/services/test_fwaas.py +++ b/ceilometer/tests/network/services/test_fwaas.py @@ -16,16 +16,16 @@ # under the License. import mock +from oslotest import base +from oslotest import mockpatch from ceilometer.central import manager from ceilometer.network.services import discovery from ceilometer.network.services import fwaas from ceilometer.openstack.common import context -from ceilometer.openstack.common.fixture import mockpatch -from ceilometer.openstack.common import test -class _BaseTestFWPollster(test.BaseTestCase): +class _BaseTestFWPollster(base.BaseTestCase): @mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock()) def setUp(self): diff --git a/ceilometer/tests/network/services/test_lbaas.py b/ceilometer/tests/network/services/test_lbaas.py index 340c6f23d..6d3cc7fe6 100644 --- a/ceilometer/tests/network/services/test_lbaas.py +++ b/ceilometer/tests/network/services/test_lbaas.py @@ -16,16 +16,16 @@ # under the License. import mock +from oslotest import base +from oslotest import mockpatch from ceilometer.central import manager from ceilometer.network.services import discovery from ceilometer.network.services import lbaas from ceilometer.openstack.common import context -from ceilometer.openstack.common.fixture import mockpatch -from ceilometer.openstack.common import test -class _BaseTestLBPollster(test.BaseTestCase): +class _BaseTestLBPollster(base.BaseTestCase): @mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock()) def setUp(self): diff --git a/ceilometer/tests/network/services/test_vpnaas.py b/ceilometer/tests/network/services/test_vpnaas.py index 75dd66e34..32d11186a 100644 --- a/ceilometer/tests/network/services/test_vpnaas.py +++ b/ceilometer/tests/network/services/test_vpnaas.py @@ -16,16 +16,16 @@ # under the License. import mock +from oslotest import base +from oslotest import mockpatch from ceilometer.central import manager from ceilometer.network.services import discovery from ceilometer.network.services import vpnaas from ceilometer.openstack.common import context -from ceilometer.openstack.common.fixture import mockpatch -from ceilometer.openstack.common import test -class _BaseTestVPNPollster(test.BaseTestCase): +class _BaseTestVPNPollster(base.BaseTestCase): @mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock()) def setUp(self): diff --git a/ceilometer/tests/network/statistics/__init__.py b/ceilometer/tests/network/statistics/__init__.py index 084e6a64b..8602c6a81 100644 --- a/ceilometer/tests/network/statistics/__init__.py +++ b/ceilometer/tests/network/statistics/__init__.py @@ -13,10 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from ceilometer.openstack.common import test +from oslotest import base -class _PollsterTestBase(test.BaseTestCase): +class _PollsterTestBase(base.BaseTestCase): def _test_pollster(self, pollster_class, meter_name, meter_type, meter_unit): diff --git a/ceilometer/tests/network/statistics/opencontrail/test_client.py b/ceilometer/tests/network/statistics/opencontrail/test_client.py index 1817a3248..344d9fb14 100644 --- a/ceilometer/tests/network/statistics/opencontrail/test_client.py +++ b/ceilometer/tests/network/statistics/opencontrail/test_client.py @@ -15,12 +15,12 @@ # under the License. import mock +from oslotest import base from ceilometer.network.statistics.opencontrail import client -from ceilometer.openstack.common import test -class TestOpencontrailClient(test.BaseTestCase): +class TestOpencontrailClient(base.BaseTestCase): def setUp(self): super(TestOpencontrailClient, self).setUp() diff --git a/ceilometer/tests/network/statistics/opencontrail/test_driver.py b/ceilometer/tests/network/statistics/opencontrail/test_driver.py index c2114c559..4360308a5 100644 --- a/ceilometer/tests/network/statistics/opencontrail/test_driver.py +++ b/ceilometer/tests/network/statistics/opencontrail/test_driver.py @@ -15,13 +15,13 @@ # under the License. import mock +from oslotest import base from six.moves.urllib import parse as urlparse from ceilometer.network.statistics.opencontrail import driver -from ceilometer.openstack.common import test -class TestOpencontrailDriver(test.BaseTestCase): +class TestOpencontrailDriver(base.BaseTestCase): def setUp(self): super(TestOpencontrailDriver, self).setUp() diff --git a/ceilometer/tests/network/statistics/opendaylight/test_client.py b/ceilometer/tests/network/statistics/opendaylight/test_client.py index aedfc1de7..87f0a0589 100644 --- a/ceilometer/tests/network/statistics/opendaylight/test_client.py +++ b/ceilometer/tests/network/statistics/opendaylight/test_client.py @@ -13,16 +13,16 @@ # License for the specific language governing permissions and limitations # under the License. import mock +from oslotest import base from requests import auth as req_auth import six from six.moves.urllib import parse as urlparse from ceilometer.network.statistics.opendaylight import client from ceilometer.openstack.common.gettextutils import _ -from ceilometer.openstack.common import test -class TestClientHTTPBasicAuth(test.BaseTestCase): +class TestClientHTTPBasicAuth(base.BaseTestCase): auth_way = 'basic' scheme = 'http' diff --git a/ceilometer/tests/network/statistics/opendaylight/test_driver.py b/ceilometer/tests/network/statistics/opendaylight/test_driver.py index f85fdc080..39b673135 100644 --- a/ceilometer/tests/network/statistics/opendaylight/test_driver.py +++ b/ceilometer/tests/network/statistics/opendaylight/test_driver.py @@ -15,16 +15,16 @@ import abc import mock +from oslotest import base import six from six import moves from six.moves.urllib import parse as url_parse from ceilometer.network.statistics.opendaylight import driver -from ceilometer.openstack.common import test @six.add_metaclass(abc.ABCMeta) -class _Base(test.BaseTestCase): +class _Base(base.BaseTestCase): @abc.abstractproperty def flow_data(self): diff --git a/ceilometer/tests/network/statistics/test_driver.py b/ceilometer/tests/network/statistics/test_driver.py index ed043528e..577afcf54 100644 --- a/ceilometer/tests/network/statistics/test_driver.py +++ b/ceilometer/tests/network/statistics/test_driver.py @@ -12,12 +12,12 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. +from oslotest import base from ceilometer.network.statistics import driver -from ceilometer.openstack.common import test -class TestDriver(test.BaseTestCase): +class TestDriver(base.BaseTestCase): def test_driver_ok(self): diff --git a/ceilometer/tests/network/statistics/test_statistics.py b/ceilometer/tests/network/statistics/test_statistics.py index a3624c34f..fd55d3365 100644 --- a/ceilometer/tests/network/statistics/test_statistics.py +++ b/ceilometer/tests/network/statistics/test_statistics.py @@ -15,14 +15,15 @@ import datetime +from oslotest import base + from ceilometer.network import statistics from ceilometer.network.statistics import driver -from ceilometer.openstack.common import test from ceilometer.openstack.common import timeutils from ceilometer import sample -class TestBase(test.BaseTestCase): +class TestBase(base.BaseTestCase): def test_subclass_ok(self): @@ -59,7 +60,7 @@ class TestBase(test.BaseTestCase): self.assertRaises(TypeError, NgSubclass3) -class TestBaseGetSamples(test.BaseTestCase): +class TestBaseGetSamples(base.BaseTestCase): def setUp(self): super(TestBaseGetSamples, self).setUp() diff --git a/ceilometer/tests/network/test_floatingip.py b/ceilometer/tests/network/test_floatingip.py index 9e0987126..35109907c 100644 --- a/ceilometer/tests/network/test_floatingip.py +++ b/ceilometer/tests/network/test_floatingip.py @@ -20,14 +20,14 @@ # under the License. import mock +from oslotest import base from ceilometer.central import manager from ceilometer.network import floatingip from ceilometer.openstack.common import context -from ceilometer.openstack.common import test -class TestFloatingIPPollster(test.BaseTestCase): +class TestFloatingIPPollster(base.BaseTestCase): @mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock()) def setUp(self): diff --git a/ceilometer/tests/objectstore/test_swift.py b/ceilometer/tests/objectstore/test_swift.py index fb2241a2d..a7c08b512 100644 --- a/ceilometer/tests/objectstore/test_swift.py +++ b/ceilometer/tests/objectstore/test_swift.py @@ -20,13 +20,13 @@ import collections from keystoneclient import exceptions import mock +from oslotest import base +from oslotest import mockpatch from swiftclient import client as swift_client import testscenarios.testcase from ceilometer.central import manager from ceilometer.objectstore import swift -from ceilometer.openstack.common.fixture import mockpatch -from ceilometer.openstack.common import test HEAD_ACCOUNTS = [('tenant-000', {'x-account-object-count': 12, 'x-account-bytes-used': 321321321, @@ -62,7 +62,7 @@ class TestManager(manager.AgentManager): class TestSwiftPollster(testscenarios.testcase.WithScenarios, - test.BaseTestCase): + base.BaseTestCase): # Define scenarios to run all of the tests against all of the # pollsters. diff --git a/ceilometer/tests/objectstore/test_swift_middleware.py b/ceilometer/tests/objectstore/test_swift_middleware.py index c31cee685..9021d937d 100644 --- a/ceilometer/tests/objectstore/test_swift_middleware.py +++ b/ceilometer/tests/objectstore/test_swift_middleware.py @@ -17,11 +17,11 @@ # under the License. import mock +from oslo.config import fixture as fixture_config +from oslotest import mockpatch import six from ceilometer.objectstore import swift_middleware -from ceilometer.openstack.common.fixture import config -from ceilometer.openstack.common.fixture import mockpatch from ceilometer import pipeline from ceilometer.tests import base as tests_base @@ -90,7 +90,7 @@ class TestSwiftMiddleware(tests_base.BaseTestCase): self.useFixture(mockpatch.PatchObject( pipeline, 'setup_pipeline', side_effect=self._fake_setup_pipeline)) - self.CONF = self.useFixture(config.Config()).conf + self.CONF = self.useFixture(fixture_config.Config()).conf self.setup_messaging(self.CONF) @staticmethod diff --git a/ceilometer/tests/orchestration/test_notifications.py b/ceilometer/tests/orchestration/test_notifications.py index 33a2d1cfc..96ecb6426 100644 --- a/ceilometer/tests/orchestration/test_notifications.py +++ b/ceilometer/tests/orchestration/test_notifications.py @@ -16,9 +16,9 @@ import datetime import mock from oslo.config import cfg +from oslotest import base from ceilometer.openstack.common import log -from ceilometer.openstack.common import test from ceilometer.orchestration import notifications from ceilometer import sample @@ -88,7 +88,7 @@ def stack_notification_for(operation, use_trust=None): } -class TestNotification(test.BaseTestCase): +class TestNotification(base.BaseTestCase): def _verify_common_sample(self, s, name, volume): self.assertIsNotNone(s) diff --git a/ceilometer/tests/pipeline_base.py b/ceilometer/tests/pipeline_base.py index 846594ca7..16acfa12d 100644 --- a/ceilometer/tests/pipeline_base.py +++ b/ceilometer/tests/pipeline_base.py @@ -22,11 +22,11 @@ import datetime import traceback import mock +from oslotest import base +from oslotest import mockpatch import six from stevedore import extension -from ceilometer.openstack.common.fixture import mockpatch -from ceilometer.openstack.common import test from ceilometer.openstack.common import timeutils from ceilometer import pipeline from ceilometer import publisher @@ -39,7 +39,7 @@ from ceilometer.transformer import conversions @six.add_metaclass(abc.ABCMeta) -class BasePipelineTestCase(test.BaseTestCase): +class BasePipelineTestCase(base.BaseTestCase): def fake_tem_init(self): """Fake a transformerManager for pipeline. diff --git a/ceilometer/tests/profiler/test_notifications.py b/ceilometer/tests/profiler/test_notifications.py index e923b0536..90f878c89 100644 --- a/ceilometer/tests/profiler/test_notifications.py +++ b/ceilometer/tests/profiler/test_notifications.py @@ -12,8 +12,8 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. +from oslotest import base -from ceilometer.openstack.common import test from ceilometer.profiler import notifications from ceilometer import sample @@ -39,7 +39,7 @@ NOTIFICATION = { } -class ProfilerNotificationsTestCase(test.BaseTestCase): +class ProfilerNotificationsTestCase(base.BaseTestCase): def test_process_notification(self): prof = notifications.ProfilerNotifications(None) diff --git a/ceilometer/tests/publisher/test_file.py b/ceilometer/tests/publisher/test_file.py index d1563b1bf..19c6ea72d 100644 --- a/ceilometer/tests/publisher/test_file.py +++ b/ceilometer/tests/publisher/test_file.py @@ -22,13 +22,14 @@ import logging.handlers import os import tempfile +from oslotest import base + from ceilometer.openstack.common import network_utils as utils -from ceilometer.openstack.common import test from ceilometer.publisher import file from ceilometer import sample -class TestFilePublisher(test.BaseTestCase): +class TestFilePublisher(base.BaseTestCase): test_data = [ sample.Sample( diff --git a/ceilometer/tests/publisher/test_rpc_publisher.py b/ceilometer/tests/publisher/test_rpc_publisher.py index 5d624ff55..6a2b55cfa 100644 --- a/ceilometer/tests/publisher/test_rpc_publisher.py +++ b/ceilometer/tests/publisher/test_rpc_publisher.py @@ -21,12 +21,12 @@ import datetime import eventlet import mock +from oslo.config import fixture as fixture_config import oslo.messaging import oslo.messaging._drivers.common from ceilometer import messaging from ceilometer.openstack.common import context -from ceilometer.openstack.common.fixture import config from ceilometer.openstack.common import network_utils from ceilometer.publisher import rpc from ceilometer import sample @@ -94,7 +94,7 @@ class TestPublish(tests_base.BaseTestCase): def setUp(self): super(TestPublish, self).setUp() - self.CONF = self.useFixture(config.Config()).conf + self.CONF = self.useFixture(fixture_config.Config()).conf self.setup_messaging(self.CONF) self.published = [] diff --git a/ceilometer/tests/publisher/test_udp.py b/ceilometer/tests/publisher/test_udp.py index 1a49b53e8..751b517d9 100644 --- a/ceilometer/tests/publisher/test_udp.py +++ b/ceilometer/tests/publisher/test_udp.py @@ -21,10 +21,10 @@ import datetime import mock import msgpack +from oslo.config import fixture as fixture_config +from oslotest import base -from ceilometer.openstack.common.fixture import config from ceilometer.openstack.common import network_utils -from ceilometer.openstack.common import test from ceilometer.publisher import udp from ceilometer.publisher import utils from ceilometer import sample @@ -33,7 +33,7 @@ from ceilometer import sample COUNTER_SOURCE = 'testsource' -class TestUDPPublisher(test.BaseTestCase): +class TestUDPPublisher(base.BaseTestCase): test_data = [ sample.Sample( name='test', @@ -110,7 +110,7 @@ class TestUDPPublisher(test.BaseTestCase): def setUp(self): super(TestUDPPublisher, self).setUp() - self.CONF = self.useFixture(config.Config()).conf + self.CONF = self.useFixture(fixture_config.Config()).conf self.CONF.publisher.metering_secret = 'not-so-secret' def test_published(self): diff --git a/ceilometer/tests/publisher/test_utils.py b/ceilometer/tests/publisher/test_utils.py index 500a506fe..db77aa9a7 100644 --- a/ceilometer/tests/publisher/test_utils.py +++ b/ceilometer/tests/publisher/test_utils.py @@ -18,13 +18,13 @@ # under the License. """Tests for ceilometer/publisher/utils.py """ +from oslotest import base from ceilometer.openstack.common import jsonutils -from ceilometer.openstack.common import test from ceilometer.publisher import utils -class TestSignature(test.BaseTestCase): +class TestSignature(base.BaseTestCase): def test_compute_signature_change_key(self): sig1 = utils.compute_signature({'a': 'A', 'b': 'B'}, 'not-so-secret') diff --git a/ceilometer/tests/storage/sqlalchemy/test_models.py b/ceilometer/tests/storage/sqlalchemy/test_models.py index 17b5b7f97..bacb04ee5 100644 --- a/ceilometer/tests/storage/sqlalchemy/test_models.py +++ b/ceilometer/tests/storage/sqlalchemy/test_models.py @@ -18,16 +18,16 @@ import datetime import mock +from oslotest import base import sqlalchemy from sqlalchemy.dialects.mysql import DECIMAL from sqlalchemy.types import NUMERIC -from ceilometer.openstack.common import test from ceilometer.storage.sqlalchemy import models from ceilometer import utils -class PreciseTimestampTest(test.BaseTestCase): +class PreciseTimestampTest(base.BaseTestCase): @staticmethod def fake_dialect(name): diff --git a/ceilometer/tests/storage/test_base.py b/ceilometer/tests/storage/test_base.py index 2410f2e4e..99e15507b 100644 --- a/ceilometer/tests/storage/test_base.py +++ b/ceilometer/tests/storage/test_base.py @@ -17,11 +17,12 @@ import datetime import math -from ceilometer.openstack.common import test +from oslotest import base as testbase + from ceilometer.storage import base -class BaseTest(test.BaseTestCase): +class BaseTest(testbase.BaseTestCase): def test_iter_period(self): times = list(base.iter_period( diff --git a/ceilometer/tests/storage/test_get_connection.py b/ceilometer/tests/storage/test_get_connection.py index 006fb1b26..04c2e3796 100644 --- a/ceilometer/tests/storage/test_get_connection.py +++ b/ceilometer/tests/storage/test_get_connection.py @@ -16,18 +16,18 @@ # under the License. """Tests for ceilometer/storage/ """ +from oslo.config import fixture as fixture_config +from oslotest import base from ceilometer.alarm.storage import impl_log as impl_log_alarm from ceilometer.alarm.storage import impl_sqlalchemy as impl_sqlalchemy_alarm -from ceilometer.openstack.common.fixture import config -from ceilometer.openstack.common import test from ceilometer import storage from ceilometer.storage import impl_log import six -class EngineTest(test.BaseTestCase): +class EngineTest(base.BaseTestCase): def test_get_connection(self): engine = storage.get_connection('log://localhost', @@ -42,10 +42,10 @@ class EngineTest(test.BaseTestCase): self.assertIn('no-such-engine', six.text_type(err)) -class ConnectionConfigTest(test.BaseTestCase): +class ConnectionConfigTest(base.BaseTestCase): def setUp(self): super(ConnectionConfigTest, self).setUp() - self.CONF = self.useFixture(config.Config()).conf + self.CONF = self.useFixture(fixture_config.Config()).conf def test_only_default_url(self): self.CONF.set_override("connection", "log://", group="database") diff --git a/ceilometer/tests/storage/test_impl_log.py b/ceilometer/tests/storage/test_impl_log.py index 602956c14..e94fff292 100644 --- a/ceilometer/tests/storage/test_impl_log.py +++ b/ceilometer/tests/storage/test_impl_log.py @@ -16,12 +16,12 @@ # under the License. """Tests for ceilometer/storage/impl_log.py """ +from oslotest import base -from ceilometer.openstack.common import test from ceilometer.storage import impl_log -class ConnectionTest(test.BaseTestCase): +class ConnectionTest(base.BaseTestCase): def test_get_connection(self): conn = impl_log.Connection(None) conn.record_metering_data({'counter_name': 'test', diff --git a/ceilometer/tests/storage/test_models.py b/ceilometer/tests/storage/test_models.py index 4f9b46a01..3f3d555a3 100644 --- a/ceilometer/tests/storage/test_models.py +++ b/ceilometer/tests/storage/test_models.py @@ -17,8 +17,9 @@ import datetime +from oslotest import base as testbase + from ceilometer.alarm.storage import models as alarm_models -from ceilometer.openstack.common import test from ceilometer.storage import base from ceilometer.storage import models @@ -28,7 +29,7 @@ class FakeModel(base.Model): base.Model.__init__(self, arg1=arg1, arg2=arg2) -class ModelTest(test.BaseTestCase): +class ModelTest(testbase.BaseTestCase): def test_create_attributes(self): m = FakeModel(1, 2) @@ -89,7 +90,7 @@ class ModelTest(test.BaseTestCase): set(alarm_models.AlarmChange.get_field_names())) -class TestTraitModel(test.BaseTestCase): +class TestTraitModel(testbase.BaseTestCase): def test_convert_value(self): v = models.Trait.convert_value( diff --git a/ceilometer/tests/test_collector.py b/ceilometer/tests/test_collector.py index 3dd5571d0..64a32ba99 100644 --- a/ceilometer/tests/test_collector.py +++ b/ceilometer/tests/test_collector.py @@ -19,15 +19,15 @@ import socket import mock import msgpack +from oslo.config import fixture as fixture_config import oslo.messaging +from oslotest import mockpatch from stevedore import extension from ceilometer import collector from ceilometer import dispatcher from ceilometer import messaging from ceilometer.openstack.common import context -from ceilometer.openstack.common.fixture import config -from ceilometer.openstack.common.fixture import mockpatch from ceilometer.openstack.common import timeutils from ceilometer.publisher import utils from ceilometer import sample @@ -42,7 +42,7 @@ class FakeConnection(): class TestCollector(tests_base.BaseTestCase): def setUp(self): super(TestCollector, self).setUp() - self.CONF = self.useFixture(config.Config()).conf + self.CONF = self.useFixture(fixture_config.Config()).conf self.CONF.import_opt("connection", "ceilometer.openstack.common.db.options", group="database") diff --git a/ceilometer/tests/test_messaging.py b/ceilometer/tests/test_messaging.py index 4869e7851..b42aabb4b 100644 --- a/ceilometer/tests/test_messaging.py +++ b/ceilometer/tests/test_messaging.py @@ -13,18 +13,17 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - +from oslo.config import fixture as fixture_config import oslo.messaging +from oslotest import base from ceilometer import messaging -from ceilometer.openstack.common.fixture import config -from ceilometer.openstack.common import test -class MessagingTests(test.BaseTestCase): +class MessagingTests(base.BaseTestCase): def setUp(self): super(MessagingTests, self).setUp() - self.CONF = self.useFixture(config.Config()).conf + self.CONF = self.useFixture(fixture_config.Config()).conf self.useFixture(oslo.messaging.conffixture.ConfFixture(self.CONF)) def test_get_transport_invalid_url(self): diff --git a/ceilometer/tests/test_middleware.py b/ceilometer/tests/test_middleware.py index 280f9a412..3de5e5930 100644 --- a/ceilometer/tests/test_middleware.py +++ b/ceilometer/tests/test_middleware.py @@ -1,5 +1,5 @@ # -# Copyright 2013 eNovance +# Copyright 2013-2014 eNovance # # Author: Julien Danjou # @@ -14,11 +14,10 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - import mock +from oslo.config import fixture as fixture_config from ceilometer import middleware -from ceilometer.openstack.common.fixture import config from ceilometer.tests import base @@ -72,7 +71,7 @@ class TestNotifications(base.BaseTestCase): def setUp(self): super(TestNotifications, self).setUp() - self.CONF = self.useFixture(config.Config()).conf + self.CONF = self.useFixture(fixture_config.Config()).conf self.setup_messaging(self.CONF) def test_process_request_notification(self): diff --git a/ceilometer/tests/test_neutronclient.py b/ceilometer/tests/test_neutronclient.py index dc9a4691e..e8ae3a013 100644 --- a/ceilometer/tests/test_neutronclient.py +++ b/ceilometer/tests/test_neutronclient.py @@ -15,12 +15,12 @@ # under the License. import mock +from oslotest import base from ceilometer import neutron_client -from ceilometer.openstack.common import test -class TestNeutronClient(test.BaseTestCase): +class TestNeutronClient(base.BaseTestCase): def setUp(self): super(TestNeutronClient, self).setUp() diff --git a/ceilometer/tests/test_notification.py b/ceilometer/tests/test_notification.py index acc435151..6d4ed2a9b 100644 --- a/ceilometer/tests/test_notification.py +++ b/ceilometer/tests/test_notification.py @@ -18,6 +18,7 @@ import eventlet import mock +from oslo.config import fixture as fixture_config import oslo.messaging import oslo.messaging.conffixture from stevedore import extension @@ -28,7 +29,6 @@ from ceilometer import messaging from ceilometer import notification from ceilometer.openstack.common import context from ceilometer.openstack.common import fileutils -from ceilometer.openstack.common.fixture import config from ceilometer.openstack.common import timeutils from ceilometer.publisher import test as test_publisher from ceilometer.tests import base as tests_base @@ -89,7 +89,7 @@ class TestNotification(tests_base.BaseTestCase): def setUp(self): super(TestNotification, self).setUp() - self.CONF = self.useFixture(config.Config()).conf + self.CONF = self.useFixture(fixture_config.Config()).conf self.CONF.set_override("connection", "log://", group='database') self.CONF.set_override("store_events", False, group="notification") self.setup_messaging(self.CONF) @@ -167,7 +167,7 @@ class TestNotification(tests_base.BaseTestCase): class TestRealNotification(tests_base.BaseTestCase): def setUp(self): super(TestRealNotification, self).setUp() - self.CONF = self.useFixture(config.Config()).conf + self.CONF = self.useFixture(fixture_config.Config()).conf self.setup_messaging(self.CONF, 'nova') pipeline = yaml.dump([{ diff --git a/ceilometer/tests/test_notifier.py b/ceilometer/tests/test_notifier.py index 1b3ece2de..19e875527 100644 --- a/ceilometer/tests/test_notifier.py +++ b/ceilometer/tests/test_notifier.py @@ -16,9 +16,9 @@ # under the License. """Tests for ceilometer/notifier.py """ +from oslotest import base from ceilometer import notifier -from ceilometer.openstack.common import test from ceilometer import pipeline from ceilometer import transformer @@ -63,7 +63,7 @@ MESSAGE = { } -class TestNotifier(test.BaseTestCase): +class TestNotifier(base.BaseTestCase): def test_process_notification(self): transformer_manager = transformer.TransformerExtensionManager( diff --git a/ceilometer/tests/test_novaclient.py b/ceilometer/tests/test_novaclient.py index 9575e9249..8cd4add3c 100644 --- a/ceilometer/tests/test_novaclient.py +++ b/ceilometer/tests/test_novaclient.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright 2013 eNovance +# Copyright 2013-2014 eNovance # # Author: Julien Danjou # @@ -18,14 +18,14 @@ import mock import novaclient +from oslo.config import fixture as fixture_config +from oslotest import base +from oslotest import mockpatch from ceilometer import nova_client -from ceilometer.openstack.common.fixture import config -from ceilometer.openstack.common.fixture import mockpatch -from ceilometer.openstack.common import test -class TestNovaClient(test.BaseTestCase): +class TestNovaClient(base.BaseTestCase): def setUp(self): super(TestNovaClient, self).setUp() @@ -38,7 +38,7 @@ class TestNovaClient(test.BaseTestCase): self.useFixture(mockpatch.PatchObject( self.nv.nova_client.images, 'get', side_effect=self.fake_images_get)) - self.CONF = self.useFixture(config.Config()).conf + self.CONF = self.useFixture(fixture_config.Config()).conf def fake_flavors_get(self, *args, **kwargs): self._flavors_count += 1 diff --git a/ceilometer/tests/test_plugin.py b/ceilometer/tests/test_plugin.py index 3f06ccad7..4ff16234f 100644 --- a/ceilometer/tests/test_plugin.py +++ b/ceilometer/tests/test_plugin.py @@ -16,9 +16,9 @@ # under the License. import mock +from oslo.config import fixture as fixture_config +from oslotest import base -from ceilometer.openstack.common.fixture import config -from ceilometer.openstack.common import test from ceilometer import plugin @@ -72,10 +72,10 @@ TEST_NOTIFICATION = { } -class NotificationBaseTestCase(test.BaseTestCase): +class NotificationBaseTestCase(base.BaseTestCase): def setUp(self): super(NotificationBaseTestCase, self).setUp() - self.CONF = self.useFixture(config.Config()).conf + self.CONF = self.useFixture(fixture_config.Config()).conf def test_handle_event_type(self): self.assertFalse(plugin.NotificationBase._handle_event_type( diff --git a/ceilometer/tests/test_utils.py b/ceilometer/tests/test_utils.py index 7ecd1052d..23311ecc5 100644 --- a/ceilometer/tests/test_utils.py +++ b/ceilometer/tests/test_utils.py @@ -21,11 +21,12 @@ import datetime import decimal -from ceilometer.openstack.common import test +from oslotest import base + from ceilometer import utils -class TestUtils(test.BaseTestCase): +class TestUtils(base.BaseTestCase): def test_datetime_to_decimal(self): expected = 1356093296.12 diff --git a/ceilometer/tests/volume/test_notifications.py b/ceilometer/tests/volume/test_notifications.py index a776e9444..7c4c91d6d 100644 --- a/ceilometer/tests/volume/test_notifications.py +++ b/ceilometer/tests/volume/test_notifications.py @@ -11,8 +11,8 @@ # under the License. import mock +from oslotest import base -from ceilometer.openstack.common import test from ceilometer.volume import notifications NOTIFICATION_VOLUME_EXISTS = { @@ -187,7 +187,7 @@ NOTIFICATION_SNAPSHOT_EXISTS = { u'priority': u'INFO'} -class TestNotifications(test.BaseTestCase): +class TestNotifications(base.BaseTestCase): def _verify_common_sample_volume(self, s, name, notification): self.assertIsNotNone(s) diff --git a/nova_tests/test_notifier.py b/nova_tests/test_notifier.py index 3cfeebac8..ec16c2322 100644 --- a/nova_tests/test_notifier.py +++ b/nova_tests/test_notifier.py @@ -22,7 +22,8 @@ import contextlib import datetime import mock - +from oslotest import base +from oslotest import moxstubout from stevedore import extension ## NOTE(dhellmann): These imports are not in the generally approved @@ -46,12 +47,6 @@ from nova.openstack.common import log as logging # sure it is defined. config.cfg.CONF.import_opt('compute_manager', 'nova.service') -# HACK(jd) Import this first because of the second HACK below, and because -# of Nova not having these module yet as of this writing -from ceilometer.openstack.common import test -from ceilometer.openstack.common.fixture import config -from ceilometer.openstack.common.fixture import moxstubout - # HACK(dhellmann): Import this before any other ceilometer code # because the notifier module messes with the import path to force # nova's version of oslo to be used instead of ceilometer's. @@ -64,7 +59,7 @@ LOG = logging.getLogger(__name__) nova_CONF = config.cfg.CONF -class TestNovaNotifier(test.BaseTestCase): +class TestNovaNotifier(base.BaseTestCase): class Pollster(object): instances = [] diff --git a/openstack-common.conf b/openstack-common.conf index 011b08791..4817472a4 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -7,7 +7,6 @@ module=db module=db.sqlalchemy module=eventlet_backdoor module=excutils -module=fixture module=gettextutils module=importutils module=jsonutils diff --git a/requirements-py3.txt b/requirements-py3.txt index f8dbf47b8..411560d84 100644 --- a/requirements-py3.txt +++ b/requirements-py3.txt @@ -10,7 +10,7 @@ lockfile>=0.8 lxml>=2.3 msgpack-python>=0.4.0 netaddr>=0.7.6 -oslo.config>=1.2.1 +oslo.config>=1.4.0.0a3 PasteDeploy>=1.5.0 pbr>=0.6,!=0.7,<1.0 pecan>=0.5.0 diff --git a/requirements.txt b/requirements.txt index 51db16848..689c16c91 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ lockfile>=0.8 lxml>=2.3 msgpack-python>=0.4.0 netaddr>=0.7.6 -oslo.config>=1.2.1 +oslo.config>=1.4.0.0a3 oslo.vmware>=0.4 # Apache-2.0 PasteDeploy>=1.5.0 pbr>=0.6,!=0.7,<1.0