openstack
/
ceilometer
Code Issues Proposed changes

Merge "tests: remove oslo.config fixture usage"

This commit is contained in:
Jenkins 2017-04-20 13:46:06 +00:00 committed by Gerrit Code Review
parent 54f774897c a226b2470e
commit c06054bd34
55 changed files with 90 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ceilometer/tests/db.py
View File

@ -21,7 +21,6 @@ import warnings
import fixtures
import mock
from oslo_config import fixture as fixture_config
from oslotest import mockpatch
import six
from six.moves.urllib import parse as urlparse
@ -165,8 +164,7 @@ class TestBase(test_base.BaseTestCase):
raise testcase.TestSkipped(
'Test is not applicable for %s' % engine)
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
manager = self.DRIVER_MANAGERS.get(engine)
if not manager:

4
ceilometer/tests/functional/api/__init__.py
View File

@ -15,7 +15,6 @@
"""Base classes for API tests.
"""
from oslo_config import fixture as fixture_config
import pecan
import pecan.testing
@ -34,8 +33,7 @@ class FunctionalTest(db_test_base.TestBase):
def setUp(self):
super(FunctionalTest, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
self.setup_messaging(self.CONF)
self.CONF.set_override("policy_file",

28
ceilometer/tests/functional/gabbi/fixtures.py
View File

@ -23,7 +23,6 @@ import uuid
from gabbi import fixture
from oslo_config import cfg
from oslo_config import fixture as fixture_config
from oslo_utils import fileutils
import six
from six.moves.urllib import parse as urlparse
@ -71,9 +70,7 @@ class ConfigFixture(fixture.GabbiFixture):
if engine not in ENGINES:
raise case.SkipTest('Database engine not supported')
conf = service.prepare_service([], [])
conf = fixture_config.Config(conf).conf
self.conf = conf
self.conf = service.prepare_service([], [])
content = ('{"default": ""}')
if six.PY3:
@ -82,28 +79,29 @@ class ConfigFixture(fixture.GabbiFixture):
prefix='policy',
suffix='.json')
conf.set_override("policy_file", self.tempfile,
group='oslo_policy')
conf.set_override(
self.conf.set_override("policy_file", self.tempfile,
group='oslo_policy')
self.conf.set_override(
'api_paste_config',
os.path.abspath(
'ceilometer/tests/functional/gabbi/gabbi_paste.ini')
)
# A special pipeline is required to use the direct publisher.
conf.set_override('pipeline_cfg_file',
'ceilometer/tests/functional/gabbi_pipeline.yaml')
self.conf.set_override(
'pipeline_cfg_file',
'ceilometer/tests/functional/gabbi_pipeline.yaml')
database_name = '%s-%s' % (db_url, str(uuid.uuid4()))
conf.set_override('connection', database_name, group='database')
conf.set_override('metering_connection', '', group='database')
self.conf.set_override('connection', database_name, group='database')
self.conf.set_override('metering_connection', '', group='database')
conf.set_override('gnocchi_is_enabled', False, group='api')
conf.set_override('aodh_is_enabled', False, group='api')
conf.set_override('panko_is_enabled', False, group='api')
self.conf.set_override('gnocchi_is_enabled', False, group='api')
self.conf.set_override('aodh_is_enabled', False, group='api')
self.conf.set_override('panko_is_enabled', False, group='api')
LOAD_APP_KWARGS = {
'conf': conf,
'conf': self.conf,
}
def stop_fixture(self):

4
ceilometer/tests/functional/test_collector.py
View File

@ -16,7 +16,6 @@ import socket
import mock
import msgpack
from oslo_config import fixture as fixture_config
import oslo_messaging
from oslo_utils import timeutils
from oslotest import mockpatch
@ -42,8 +41,7 @@ class FakeConnection(object):
class TestCollector(tests_base.BaseTestCase):
def setUp(self):
super(TestCollector, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
self.CONF.import_opt("connection", "oslo_db.options", group="database")
self.CONF.set_override("connection", "log://", group='database')
self.CONF.set_override('telemetry_secret', 'not-so-secret',

10
ceilometer/tests/functional/test_notification.py
View File

@ -17,7 +17,6 @@
import time
import mock
from oslo_config import fixture as fixture_config
import oslo_messaging
from oslo_utils import fileutils
import six
@ -99,8 +98,7 @@ class TestNotification(tests_base.BaseTestCase):
def setUp(self):
super(TestNotification, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
self.CONF.set_override("connection", "log://", group='database')
self.CONF.set_override("backend_url", "zake://", group="coordination")
self.CONF.set_override("workload_partitioning", True,
@ -221,8 +219,7 @@ class BaseRealNotification(tests_base.BaseTestCase):
def setUp(self):
super(BaseRealNotification, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
self.setup_messaging(self.CONF, 'nova')
pipeline_cfg_file = self.setup_pipeline(['vcpus', 'memory'])
@ -447,8 +444,7 @@ class TestRealNotificationMultipleAgents(tests_base.BaseTestCase):
def setUp(self):
super(TestRealNotificationMultipleAgents, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
self.setup_messaging(self.CONF, 'nova')
pipeline_cfg_file = self.setup_pipeline(['instance', 'memory'])

4
ceilometer/tests/unit/agent/agentbase.py
View File

@ -23,7 +23,6 @@ import os
import tempfile
import mock
from oslo_config import fixture as fixture_config
import six
from stevedore import extension
import yaml
@ -248,8 +247,7 @@ class BaseAgentManagerTestCase(base.BaseTestCase):
@mock.patch('ceilometer.pipeline.setup_polling', mock.MagicMock())
def setUp(self):
super(BaseAgentManagerTestCase, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
self.CONF.set_override(
'cfg_file',
self.path_get('etc/ceilometer/polling.yaml'), group='polling'

22
ceilometer/tests/unit/agent/test_discovery.py
View File

@ -16,7 +16,6 @@
"""
import mock
from oslo_config import fixture as fixture_config
from oslotest import base
from ceilometer.agent.discovery import endpoint
@ -29,13 +28,12 @@ class TestEndpointDiscovery(base.BaseTestCase):
def setUp(self):
super(TestEndpointDiscovery, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF.set_override('interface', 'publicURL',
group='service_credentials')
self.CONF.set_override('region_name', 'test-region-name',
group='service_credentials')
self.discovery = endpoint.EndpointDiscovery(self.CONF)
CONF = service.prepare_service([], [])
CONF.set_override('interface', 'publicURL',
group='service_credentials')
CONF.set_override('region_name', 'test-region-name',
group='service_credentials')
self.discovery = endpoint.EndpointDiscovery(CONF)
self.manager = mock.MagicMock()
self.catalog = (self.manager.keystone.session.auth.get_access.
return_value.service_catalog)
@ -64,9 +62,8 @@ class TestEndpointDiscovery(base.BaseTestCase):
class TestLocalnodeDiscovery(base.BaseTestCase):
def setUp(self):
super(TestLocalnodeDiscovery, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.discovery = localnode.LocalNodeDiscovery(self.CONF)
CONF = service.prepare_service([], [])
self.discovery = localnode.LocalNodeDiscovery(CONF)
self.manager = mock.MagicMock()
def test_lockalnode_discovery(self):
@ -103,8 +100,7 @@ class TestHardwareDiscovery(base.BaseTestCase):
def setUp(self):
super(TestHardwareDiscovery, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
self.discovery = hardware.NodesDiscoveryTripleO(self.CONF)
self.discovery.nova_cli = mock.MagicMock()
self.manager = mock.MagicMock()

4
ceilometer/tests/unit/agent/test_manager.py
View File

@ -16,7 +16,6 @@
from keystoneauth1 import exceptions as ka_exceptions
import mock
from oslo_config import fixture as fixture_config
from oslo_utils import fileutils
from oslotest import base
from oslotest import mockpatch
@ -49,8 +48,7 @@ class TestPollsterBuilder(agentbase.TestPollster):
class TestManager(base.BaseTestCase):
def setUp(self):
super(TestManager, self).setUp()
conf = service.prepare_service([], [])
self.conf = self.useFixture(fixture_config.Config(conf)).conf
self.conf = service.prepare_service([], [])
@mock.patch('ceilometer.pipeline.setup_polling', mock.MagicMock())
def test_load_plugins(self):

7
ceilometer/tests/unit/agent/test_plugin.py
View File

@ -14,19 +14,12 @@
# under the License.
import mock
from oslo_config import fixture as fixture_config
from oslotest import base
from ceilometer.agent import plugin_base
from ceilometer import service
class NotificationBaseTestCase(base.BaseTestCase):
def setUp(self):
super(NotificationBaseTestCase, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
class FakePlugin(plugin_base.NotificationBase):
event_types = ['compute.*']

4
ceilometer/tests/unit/api/test_app.py
View File

@ -15,7 +15,6 @@
import mock
from oslo_config import cfg
from oslo_config import fixture as fixture_config
from ceilometer.api import app
from ceilometer import service
@ -26,8 +25,7 @@ class TestApp(base.BaseTestCase):
def setUp(self):
super(TestApp, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
def test_api_paste_file_not_exist(self):
self.CONF.set_override('api_paste_config', 'non-existent-file')

4
ceilometer/tests/unit/api/test_hooks.py
View File

@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo_config import fixture as fixture_config
import oslo_messaging
from ceilometer.api import hooks
@ -25,8 +24,7 @@ class TestTestNotifierHook(base.BaseTestCase):
def setUp(self):
super(TestTestNotifierHook, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
def test_init_notifier_with_drivers(self):
hook = hooks.NotifierHook(self.CONF)

4
ceilometer/tests/unit/compute/pollsters/base.py
View File

@ -15,7 +15,6 @@
# under the License.
import mock
from oslo_config import fixture as fixture_config
from oslotest import mockpatch
from ceilometer.compute.virt import inspector as virt_inspector
@ -27,8 +26,7 @@ class TestPollsterBase(base.BaseTestCase):
def setUp(self):
super(TestPollsterBase, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
self.inspector = mock.Mock()
self.instance = mock.MagicMock()

4
ceilometer/tests/unit/compute/pollsters/test_location_metadata.py
View File

@ -17,7 +17,6 @@
"""
import mock
from oslo_config import fixture as fixture_config
from oslotest import base
import six
@ -46,8 +45,7 @@ class TestLocationMetadata(base.BaseTestCase):
@mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock())
def setUp(self):
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
self.manager = manager.AgentManager(0, self.CONF)
super(TestLocationMetadata, self).setUp()

4
ceilometer/tests/unit/compute/test_discovery.py
View File

@ -14,7 +14,6 @@ import datetime
import iso8601
import mock
from oslo_config import fixture as fixture_config
from oslotest import mockpatch
from ceilometer.compute import discovery
@ -121,8 +120,7 @@ class TestDiscovery(base.BaseTestCase):
self.utc_now)
self.useFixture(patch_timeutils)
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
self.CONF.set_override('host', 'test')
def test_normal_discovery(self):

4
ceilometer/tests/unit/compute/virt/hyperv/test_inspector.py
View File

@ -19,7 +19,6 @@ import sys
import mock
from os_win import exceptions as os_win_exc
from oslo_config import fixture as fixture_config
from oslo_utils import units
from oslotest import base
@ -35,8 +34,7 @@ class TestHyperVInspection(base.BaseTestCase):
'_compute_host_max_cpu_clock')
def setUp(self, mock_compute_host_cpu_clock):
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self._inspector = hyperv_inspector.HyperVInspector(self.CONF)
self._inspector = hyperv_inspector.HyperVInspector(conf)
self._inspector._utils = mock.MagicMock()
super(TestHyperVInspection, self).setUp()

7
ceilometer/tests/unit/compute/virt/libvirt/test_inspector.py
View File

@ -16,7 +16,6 @@
import fixtures
import mock
from oslo_config import fixture as fixture_config
from oslo_utils import units
from oslotest import base
@ -40,7 +39,6 @@ class TestLibvirtInspection(base.BaseTestCase):
def setUp(self):
super(TestLibvirtInspection, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.instance = VMInstance()
libvirt_inspector.libvirt = mock.Mock()
@ -50,7 +48,7 @@ class TestLibvirtInspection(base.BaseTestCase):
utils.libvirt = libvirt_inspector.libvirt
with mock.patch('ceilometer.compute.virt.libvirt.utils.'
'refresh_libvirt_connection', return_value=None):
self.inspector = libvirt_inspector.LibvirtInspector(self.CONF)
self.inspector = libvirt_inspector.LibvirtInspector(conf)
def test_inspect_instance_stats(self):
domain = mock.Mock()
@ -436,7 +434,6 @@ class TestLibvirtInspectionWithError(base.BaseTestCase):
def setUp(self):
super(TestLibvirtInspectionWithError, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.useFixture(fixtures.MonkeyPatch(
'ceilometer.compute.virt.libvirt.utils.'
'refresh_libvirt_connection',
@ -444,7 +441,7 @@ class TestLibvirtInspectionWithError(base.BaseTestCase):
libvirt_inspector.libvirt = mock.Mock()
libvirt_inspector.libvirt.libvirtError = FakeLibvirtError
utils.libvirt = libvirt_inspector.libvirt
self.inspector = libvirt_inspector.LibvirtInspector(self.CONF)
self.inspector = libvirt_inspector.LibvirtInspector(conf)
def test_inspect_unknown_error(self):
self.assertRaises(virt_inspector.InspectorException,

4
ceilometer/tests/unit/compute/virt/vmware/test_inspector.py
View File

@ -17,7 +17,6 @@ Tests for VMware vSphere inspector.
"""
import mock
from oslo_config import fixture as fixture_config
from oslo_vmware import api
from oslotest import base
@ -31,13 +30,12 @@ class TestVsphereInspection(base.BaseTestCase):
def setUp(self):
super(TestVsphereInspection, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
api_session = api.VMwareAPISession("test_server", "test_user",
"test_password", 0, None,
create_session=False, port=7443)
vsphere_inspector.get_api_session = mock.Mock(
return_value=api_session)
self._inspector = vsphere_inspector.VsphereInspector(self.CONF)
self._inspector = vsphere_inspector.VsphereInspector(conf)
self._inspector._ops = mock.MagicMock()
def test_instance_notFound(self):

4
ceilometer/tests/unit/compute/virt/xenapi/test_inspector.py
View File

@ -15,7 +15,6 @@
"""
import mock
from oslo_config import fixture as fixture_config
from oslotest import base
from ceilometer.compute.virt.xenapi import inspector as xenapi_inspector
@ -55,10 +54,9 @@ class TestXenapiInspection(base.BaseTestCase):
def setUp(self):
super(TestXenapiInspection, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
api_session = mock.Mock()
xenapi_inspector.get_api_session = mock.Mock(return_value=api_session)
self.inspector = xenapi_inspector.XenapiInspector(self.CONF)
self.inspector = xenapi_inspector.XenapiInspector(conf)
def test_inspect_instance(self):
fake_instance = {'OS-EXT-SRV-ATTR:instance_name': 'fake_instance_name',

4
ceilometer/tests/unit/dispatcher/test_db.py
View File

@ -15,7 +15,6 @@
import datetime
import mock
from oslo_config import fixture as fixture_config
from oslotest import base
from ceilometer.dispatcher import database
@ -27,8 +26,7 @@ class TestDispatcherDB(base.BaseTestCase):
def setUp(self):
super(TestDispatcherDB, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
self.CONF.set_override('connection', 'sqlite://', group='database')
self.meter_dispatcher = database.MeterDatabaseDispatcher(self.CONF)

4
ceilometer/tests/unit/dispatcher/test_file.py
View File

@ -16,7 +16,6 @@ import logging.handlers
import os
import tempfile
from oslo_config import fixture as fixture_config
from oslotest import base
from ceilometer.dispatcher import file
@ -28,8 +27,7 @@ class TestDispatcherFile(base.BaseTestCase):
def setUp(self):
super(TestDispatcherFile, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
def test_file_dispatcher_with_all_config(self):
# Create a temporaryFile to get a file name

7
ceilometer/tests/unit/dispatcher/test_http.py
View File

@ -17,7 +17,6 @@ import datetime
import uuid
import mock
from oslo_config import fixture as fixture_config
from oslotest import base
import requests
@ -32,8 +31,7 @@ class TestDispatcherHttp(base.BaseTestCase):
def setUp(self):
super(TestDispatcherHttp, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
self.msg = {'counter_name': 'test',
'resource_id': self.id(),
'counter_volume': 1,
@ -144,8 +142,7 @@ class TestEventDispatcherHttp(base.BaseTestCase):
"""Test sending events with the http dispatcher"""
def setUp(self):
super(TestEventDispatcherHttp, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
# repr(uuid.uuid4()) is used in test event creation to avoid an
# exception being thrown when the uuid is serialized to JSON

4
ceilometer/tests/unit/event/test_converter.py
View File

@ -17,7 +17,6 @@ import datetime
import jsonpath_rw_ext
import mock
from oslo_config import fixture as fixture_config
import six
from ceilometer import declarative
@ -598,8 +597,7 @@ class TestNotificationConverter(ConverterBase):
def setUp(self):
super(TestNotificationConverter, self).setUp()
conf = ceilometer_service.prepare_service(argv=[], config_files=[])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = ceilometer_service.prepare_service([], [])
self.valid_event_def1 = [{
'event_type': 'compute.instance.create.*',
'traits': {

4
ceilometer/tests/unit/event/test_endpoint.py
View File

@ -15,7 +15,6 @@
"""Tests for Ceilometer notify daemon."""
import mock
from oslo_config import fixture as fixture_config
import oslo_messaging
from oslo_utils import fileutils
from oslotest import mockpatch
@ -124,8 +123,7 @@ class TestEventEndpoint(tests_base.BaseTestCase):
def setUp(self):
super(TestEventEndpoint, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
self.CONF.set_override("connection", "log://", group='database')
self.setup_messaging(self.CONF)

4
ceilometer/tests/unit/hardware/pollsters/test_generic.py
View File

@ -17,7 +17,6 @@ import mock
import six
import yaml
from oslo_config import fixture as fixture_config
from oslo_utils import fileutils
from oslotest import mockpatch
@ -110,8 +109,7 @@ class TestGenericPollsters(test_base.BaseTestCase):
def setUp(self):
super(TestGenericPollsters, self).setUp()
conf = service.prepare_service([], [])
self.conf = self.useFixture(fixture_config.Config(conf)).conf
self.conf = service.prepare_service([], [])
self.resources = ["snmp://test", "snmp://test2"]
self.useFixture(mockpatch.Patch(
'ceilometer.hardware.inspector.get_inspector',

6
ceilometer/tests/unit/image/test_glance.py
View File

@ -14,7 +14,6 @@
# under the License.
import mock
from oslo_config import fixture as fixture_config
from ceilometer.agent import manager
from ceilometer.image import glance
@ -89,9 +88,8 @@ class TestImagePollsterPageSize(base.BaseTestCase):
def setUp(self):
super(TestImagePollsterPageSize, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.manager = manager.AgentManager(0, self.CONF)
self.pollster = glance.ImageSizePollster(self.CONF)
self.manager = manager.AgentManager(0, conf)
self.pollster = glance.ImageSizePollster(conf)
def test_image_pollster(self):
image_samples = list(

4
ceilometer/tests/unit/ipmi/platform/test_intel_node_manager.py
View File

@ -16,7 +16,6 @@ import abc
import tempfile
import mock
from oslo_config import fixture as fixture_config
from oslotest import base
import six
@ -36,11 +35,10 @@ class _Base(base.BaseTestCase):
def setUp(self):
super(_Base, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.init_test_engine()
with mock.patch.object(node_manager.NodeManager, '__new__',
side_effect=self._new_no_singleton):
self.nm = node_manager.NodeManager(self.CONF)
self.nm = node_manager.NodeManager(conf)
@staticmethod
def _new_no_singleton(cls, *args, **kwargs):

4
ceilometer/tests/unit/ipmi/pollsters/base.py
View File

@ -15,7 +15,6 @@
import abc
import mock
from oslo_config import fixture as fixture_config
from oslotest import mockpatch
import six
@ -29,8 +28,7 @@ class TestPollsterBase(base.BaseTestCase):
def setUp(self):
super(TestPollsterBase, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
def fake_data(self):
"""Fake data used for test."""

4
ceilometer/tests/unit/meter/test_notifications.py
View File

@ -18,7 +18,6 @@ import os
import six
import yaml
from oslo_config import fixture as fixture_config
from oslo_utils import encodeutils
from oslo_utils import fileutils
@ -284,8 +283,7 @@ class TestMeterProcessing(test.BaseTestCase):
def setUp(self):
super(TestMeterProcessing, self).setUp()
conf = ceilometer_service.prepare_service(argv=[], config_files=[])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = ceilometer_service.prepare_service([], [])
self.handler = notifications.ProcessMeterNotifications(
mock.Mock(conf=self.CONF))

4
ceilometer/tests/unit/network/services/test_fwaas.py
View File

@ -14,7 +14,6 @@
# under the License.
import mock
from oslo_config import fixture as fixture_config
from oslotest import base
from oslotest import mockpatch
@ -31,8 +30,7 @@ class _BaseTestFWPollster(base.BaseTestCase):
def setUp(self):
super(_BaseTestFWPollster, self).setUp()
self.addCleanup(mock.patch.stopall)
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
self.manager = manager.AgentManager(0, self.CONF)
plugin_base._get_keystone = mock.Mock()
catalog = (plugin_base._get_keystone.session.auth.get_access.

4
ceilometer/tests/unit/network/services/test_lbaas.py
View File

@ -15,7 +15,6 @@
import mock
from oslo_config import fixture as fixture_config
from oslotest import base
from oslotest import mockpatch
@ -32,8 +31,7 @@ class _BaseTestLBPollster(base.BaseTestCase):
def setUp(self):
super(_BaseTestLBPollster, self).setUp()
self.addCleanup(mock.patch.stopall)
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
self.manager = manager.AgentManager(0, self.CONF)
self.CONF.set_override('neutron_lbaas_version',
'v1',

4
ceilometer/tests/unit/network/services/test_lbaas_v2.py
View File

@ -14,7 +14,6 @@
import mock
from oslo_config import fixture as fixture_config
from oslotest import base
from oslotest import mockpatch
@ -31,8 +30,7 @@ class _BaseTestLBPollster(base.BaseTestCase):
def setUp(self):
super(_BaseTestLBPollster, self).setUp()
self.addCleanup(mock.patch.stopall)
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
self.manager = manager.AgentManager(0, self.CONF)
plugin_base._get_keystone = mock.Mock()
catalog = (plugin_base._get_keystone.session.auth.get_access.

4
ceilometer/tests/unit/network/services/test_vpnaas.py
View File

@ -14,7 +14,6 @@
# under the License.
import mock
from oslo_config import fixture as fixture_config
from oslotest import base
from oslotest import mockpatch
@ -31,8 +30,7 @@ class _BaseTestVPNPollster(base.BaseTestCase):
def setUp(self):
super(_BaseTestVPNPollster, self).setUp()
self.addCleanup(mock.patch.stopall)
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
self.manager = manager.AgentManager(0, self.CONF)
plugin_base._get_keystone = mock.Mock()
catalog = (plugin_base._get_keystone.session.auth.get_access.

4
ceilometer/tests/unit/network/statistics/__init__.py
View File

@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo_config import fixture as fixture_config
from oslotest import base
from ceilometer import service
@ -22,8 +21,7 @@ from ceilometer import service
class _PollsterTestBase(base.BaseTestCase):
def setUp(self):
super(_PollsterTestBase, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
def _test_pollster(self, pollster_class, meter_name,
meter_type, meter_unit):

4
ceilometer/tests/unit/network/statistics/opencontrail/test_driver.py
View File

@ -13,7 +13,6 @@
# under the License.
import mock
from oslo_config import fixture as fixture_config
from oslotest import base
from six.moves.urllib import parse as urlparse
@ -31,8 +30,7 @@ class TestOpencontrailDriver(base.BaseTestCase):
return_value=self.fake_ports())
self.nc_ports.start()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
self.driver = driver.OpencontrailDriver(self.CONF)
self.parse_url = urlparse.ParseResult('opencontrail',
'127.0.0.1:8143',

4
ceilometer/tests/unit/network/statistics/opendaylight/test_driver.py
View File

@ -15,7 +15,6 @@
import abc
import mock
from oslo_config import fixture as fixture_config
from oslotest import base
import six
from six import moves
@ -79,8 +78,7 @@ class _Base(base.BaseTestCase):
super(_Base, self).setUp()
self.addCleanup(mock.patch.stopall)
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.driver = driver.OpenDayLightDriver(self.CONF)
self.driver = driver.OpenDayLightDriver(conf)
self.get_flow_statistics = mock.patch(
'ceilometer.network.statistics.opendaylight.client.'

7
ceilometer/tests/unit/network/statistics/test_statistics.py
View File

@ -15,7 +15,6 @@
import datetime
from oslo_config import fixture as fixture_config
from oslo_utils import timeutils
from oslotest import base
@ -29,8 +28,7 @@ class TestBase(base.BaseTestCase):
def setUp(self):
super(TestBase, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
def test_subclass_ok(self):
@ -71,8 +69,7 @@ class TestBaseGetSamples(base.BaseTestCase):
def setUp(self):
super(TestBaseGetSamples, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
class FakePollster(statistics._Base):
meter_name = 'foo'

4
ceilometer/tests/unit/network/test_floating_ip.py
View File

@ -15,7 +15,6 @@
# under the License.
import mock
from oslo_config import fixture as fixture_config
from oslotest import base
from oslotest import mockpatch
@ -31,8 +30,7 @@ class _BaseTestFloatingIPPollster(base.BaseTestCase):
@mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock())
def setUp(self):
super(_BaseTestFloatingIPPollster, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
self.manager = manager.AgentManager(0, self.CONF)
plugin_base._get_keystone = mock.Mock()

10
ceilometer/tests/unit/objectstore/test_rgw.py
View File

@ -16,7 +16,6 @@ import collections
from keystoneauth1 import exceptions
import mock
from oslo_config import fixture as fixture_config
from oslotest import base
from oslotest import mockpatch
import testscenarios.testcase
@ -90,11 +89,10 @@ class TestRgwPollster(testscenarios.testcase.WithScenarios,
def setUp(self):
super(TestRgwPollster, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF.set_override('radosgw', 'object-store',
group='service_types')
self.pollster = self.factory(self.CONF)
self.manager = TestManager(0, self.CONF)
conf.set_override('radosgw', 'object-store',
group='service_types')
self.pollster = self.factory(conf)
self.manager = TestManager(0, conf)
if self.pollster.CACHE_KEY_METHOD == 'rgw.get_bucket':
self.ACCOUNTS = GET_BUCKETS

4
ceilometer/tests/unit/objectstore/test_swift.py
View File

@ -16,7 +16,6 @@ import collections
from keystoneauth1 import exceptions
import mock
from oslo_config import fixture as fixture_config
from oslotest import base
from oslotest import mockpatch
from swiftclient import client as swift_client
@ -106,8 +105,7 @@ class TestSwiftPollster(testscenarios.testcase.WithScenarios,
@mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock())
def setUp(self):
super(TestSwiftPollster, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
self.pollster = self.factory(self.CONF)
self.manager = TestManager(0, self.CONF)

4
ceilometer/tests/unit/pipeline_base.py
View File

@ -21,7 +21,6 @@ import traceback
import unittest
import mock
from oslo_config import fixture as fixture_config
from oslo_utils import timeutils
from oslotest import mockpatch
import six
@ -133,8 +132,7 @@ class BasePipelineTestCase(base.BaseTestCase):
def setUp(self):
super(BasePipelineTestCase, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
self.test_counter = sample.Sample(
name='a',

4
ceilometer/tests/unit/publisher/test_file.py
View File

@ -20,7 +20,6 @@ import logging.handlers
import os
import tempfile
from oslo_config import fixture as fixture_config
from oslo_utils import netutils
from oslotest import base
@ -69,8 +68,7 @@ class TestFilePublisher(base.BaseTestCase):
def setUp(self):
super(TestFilePublisher, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
def test_file_publisher_maxbytes(self):
# Test valid configurations

4
ceilometer/tests/unit/publisher/test_http.py
View File

@ -17,7 +17,6 @@
import datetime
import mock
from oslo_config import fixture as fixture_config
from oslotest import base
import requests
from six.moves.urllib import parse as urlparse
@ -76,8 +75,7 @@ class TestHttpPublisher(base.BaseTestCase):
def setUp(self):
super(TestHttpPublisher, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
def test_http_publisher_config(self):
"""Test publisher config parameters."""

4
ceilometer/tests/unit/publisher/test_kafka_broker_publisher.py
View File

@ -18,7 +18,6 @@ import datetime
import uuid
import mock
from oslo_config import fixture as fixture_config
from oslo_utils import netutils
from ceilometer.event.storage import models as event
@ -99,8 +98,7 @@ class TestKafkaPublisher(tests_base.BaseTestCase):
def setUp(self):
super(TestKafkaPublisher, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
def test_publish(self):
publisher = kafka.KafkaBrokerPublisher(self.CONF, netutils.urlsplit(

4
ceilometer/tests/unit/publisher/test_messaging_publisher.py
View File

@ -18,7 +18,6 @@ import datetime
import uuid
import mock
from oslo_config import fixture as fixture_config
from oslo_utils import netutils
import testscenarios.testcase
@ -98,8 +97,7 @@ class BasePublisherTestCase(tests_base.BaseTestCase):
def setUp(self):
super(BasePublisherTestCase, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
self.setup_messaging(self.CONF)

4
ceilometer/tests/unit/publisher/test_udp.py
View File

@ -20,7 +20,6 @@ import socket
import mock
import msgpack
from oslo_config import fixture as fixture_config
from oslo_utils import netutils
from oslotest import base
@ -111,8 +110,7 @@ class TestUDPPublisher(base.BaseTestCase):
def setUp(self):
super(TestUDPPublisher, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
self.CONF.publisher.telemetry_secret = 'not-so-secret'
def _check_udp_socket(self, url, expected_addr_family):

10
ceilometer/tests/unit/storage/test_get_connection.py
View File

@ -15,7 +15,6 @@
"""Tests for ceilometer/storage/
"""
import mock
from oslo_config import fixture as fixture_config
from oslotest import base
from ceilometer import service
@ -29,8 +28,7 @@ import six
class EngineTest(base.BaseTestCase):
def setUp(self):
super(EngineTest, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
def test_get_connection(self):
engine = storage.get_connection(self.CONF,
@ -48,8 +46,7 @@ class EngineTest(base.BaseTestCase):
class ConnectionRetryTest(base.BaseTestCase):
def setUp(self):
super(ConnectionRetryTest, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
def test_retries(self):
with mock.patch.object(storage, 'get_connection') as retries:
@ -66,8 +63,7 @@ class ConnectionRetryTest(base.BaseTestCase):
class ConnectionConfigTest(base.BaseTestCase):
def setUp(self):
super(ConnectionConfigTest, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
def test_only_default_url(self):
self.CONF.set_override("connection", "log://", group="database")

4
ceilometer/tests/unit/test_coordination.py
View File

@ -16,7 +16,6 @@
import logging
import mock
from oslo_config import fixture as fixture_config
import tooz.coordination
from tooz import hashring
@ -121,8 +120,7 @@ class TestPartitioning(base.BaseTestCase):
def setUp(self):
super(TestPartitioning, self).setUp()
self.CONF = self.useFixture(fixture_config.Config(
service.prepare_service([], []))).conf
self.CONF = service.prepare_service([], [])
self.str_handler = MockLoggingHandler()
coordination.LOG.logger.addHandler(self.str_handler)
self.shared_storage = {}

4
ceilometer/tests/unit/test_event_pipeline.py
View File

@ -16,7 +16,6 @@ import traceback
import uuid
import mock
from oslo_config import fixture as fixture_config
import oslo_messaging
from oslotest import mockpatch
@ -46,8 +45,7 @@ class EventPipelineTestCase(base.BaseTestCase):
def setUp(self):
super(EventPipelineTestCase, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
self.p_type = pipeline.EVENT_TYPE
self.transformer_manager = None

4
ceilometer/tests/unit/test_messaging.py
View File

@ -12,7 +12,6 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo_config import fixture as fixture_config
import oslo_messaging.conffixture
from oslotest import base
@ -23,8 +22,7 @@ from ceilometer import service
class MessagingTests(base.BaseTestCase):
def setUp(self):
super(MessagingTests, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
self.useFixture(oslo_messaging.conffixture.ConfFixture(self.CONF))
def test_get_transport_invalid_url(self):

4
ceilometer/tests/unit/test_middleware.py
View File

@ -13,7 +13,6 @@
# 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 import service
@ -70,8 +69,7 @@ class TestNotifications(base.BaseTestCase):
def setUp(self):
super(TestNotifications, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
self.setup_messaging(self.CONF)
def test_process_request_notification(self):

4
ceilometer/tests/unit/test_neutronclient.py
View File

@ -14,7 +14,6 @@
import mock
from oslo_config import fixture as fixture_config
from oslotest import base
from ceilometer import neutron_client
@ -25,8 +24,7 @@ class TestNeutronClient(base.BaseTestCase):
def setUp(self):
super(TestNeutronClient, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
self.nc = neutron_client.Client(self.CONF)
self.nc.lb_version = 'v1'

4
ceilometer/tests/unit/test_neutronclient_lbaas_v2.py
View File

@ -13,7 +13,6 @@
import mock
from neutronclient.v2_0 import client
from oslo_config import fixture as fixture_config
from oslotest import base
from ceilometer import neutron_client
@ -25,8 +24,7 @@ class TestNeutronClientLBaaSV2(base.BaseTestCase):
def setUp(self):
super(TestNeutronClientLBaaSV2, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.nc = neutron_client.Client(self.CONF)
self.nc = neutron_client.Client(conf)
@staticmethod
def fake_list_lbaas_pools():

4
ceilometer/tests/unit/test_novaclient.py
View File

@ -15,7 +15,6 @@
import glanceclient
import mock
import novaclient
from oslo_config import fixture as fixture_config
from oslotest import base
from oslotest import mockpatch
@ -27,8 +26,7 @@ class TestNovaClient(base.BaseTestCase):
def setUp(self):
super(TestNovaClient, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
self._flavors_count = 0
self._images_count = 0
self.nv = nova_client.Client(self.CONF)

4
ceilometer/tests/unit/test_polling.py
View File

@ -14,7 +14,6 @@
import os
import tempfile
from oslo_config import fixture as fixture_config
from oslotest import base
import yaml
@ -31,8 +30,7 @@ class PollingTestCase(base.BaseTestCase):
def setUp(self):
super(PollingTestCase, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.CONF = service.prepare_service([], [])
self.tmp_cfg = tempfile.NamedTemporaryFile(mode='w', delete=False)
self.poll_cfg = {'sources': [{'name': 'test_source',

16
ceilometer/tests/unit/volume/test_cinder.py
View File

@ -12,7 +12,6 @@
# under the License.
import mock
from oslo_config import fixture as fixture_config
from ceilometer.agent import manager
from ceilometer import service
@ -109,9 +108,8 @@ class TestVolumeSizePollster(base.BaseTestCase):
def setUp(self):
super(TestVolumeSizePollster, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.manager = manager.AgentManager(0, self.CONF)
self.pollster = cinder.VolumeSizePollster(self.CONF)
self.manager = manager.AgentManager(0, conf)
self.pollster = cinder.VolumeSizePollster(conf)
def test_volume_size_pollster(self):
volume_size_samples = list(
@ -130,9 +128,8 @@ class TestVolumeSnapshotSizePollster(base.BaseTestCase):
def setUp(self):
super(TestVolumeSnapshotSizePollster, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.manager = manager.AgentManager(0, self.CONF)
self.pollster = cinder.VolumeSnapshotSize(self.CONF)
self.manager = manager.AgentManager(0, conf)
self.pollster = cinder.VolumeSnapshotSize(conf)
def test_volume_snapshot_size_pollster(self):
volume_snapshot_size_samples = list(
@ -153,9 +150,8 @@ class TestVolumeBackupSizePollster(base.BaseTestCase):
def setUp(self):
super(TestVolumeBackupSizePollster, self).setUp()
conf = service.prepare_service([], [])
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
self.manager = manager.AgentManager(0, self.CONF)
self.pollster = cinder.VolumeBackupSize(self.CONF)
self.manager = manager.AgentManager(0, conf)
self.pollster = cinder.VolumeBackupSize(conf)
def test_volume_backup_size_pollster(self):
volume_backup_size_samples = list(