openstack
/
ec2-api
Code Issues Proposed changes

Use oslo config fixture in unit tests 

Change-Id: Ie523623417d8e30d05b4c8b05e9f2ddf74d4f5e3
This commit is contained in:
Feodor Tersin 2015-03-04 19:29:51 +03:00
parent 87ace458a8
commit 5032355da3
6 changed files with 26 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ec2api/tests/unit/base.py
View File

@ -16,7 +16,7 @@ import copy
import itertools
import mock
from oslo_config import cfg
from oslo_config import fixture as config_fixture
from oslotest import base as test_base
import ec2api.api.apirequest
@ -76,9 +76,8 @@ class ApiTestCase(test_base.BaseTestCase):
self.isotime = isotime_patcher.start()
self.addCleanup(isotime_patcher.stop)
conf = cfg.CONF
conf.set_override('fatal_exception_format_errors', True)
self.addCleanup(conf.reset)
self._conf = self.useFixture(config_fixture.Config())
self.configure(fatal_exception_format_errors=True)
def execute(self, action, args):
ec2_request = ec2api.api.apirequest.APIRequest(action, 'fake_v1', args)
@ -143,6 +142,9 @@ class ApiTestCase(test_base.BaseTestCase):
for i in items))
self.set_mock_db_items(*merged_items)
def configure(self, **kwargs):
self._conf.config(**kwargs)
def check_filtering(self, operation, resultset_key, filters):
for name, value in filters:
resp = self.execute(operation,

9
ec2api/tests/unit/test_address.py
View File

@ -15,7 +15,6 @@
import mock
from neutronclient.common import exceptions as neutron_exception
from novaclient import exceptions as nova_exception
from oslo_config import cfg
from ec2api.api import address
from ec2api.tests.unit import base
@ -43,9 +42,7 @@ class AddressTestCase(base.ApiTestCase):
def test_allocate_vpc_address(self):
address.address_engine = (
address.AddressEngineNeutron())
conf = cfg.CONF
self.addCleanup(conf.reset)
conf.set_override('external_network', fakes.NAME_OS_PUBLIC_NETWORK)
self.configure(external_network=fakes.NAME_OS_PUBLIC_NETWORK)
self.neutron.list_networks.return_value = (
{'networks': [{'id': fakes.ID_OS_PUBLIC_NETWORK}]})
self.neutron.create_floatingip.return_value = (
@ -100,9 +97,7 @@ class AddressTestCase(base.ApiTestCase):
def test_allocate_address_vpc_rollback(self):
address.address_engine = (
address.AddressEngineNeutron())
conf = cfg.CONF
self.addCleanup(conf.reset)
conf.set_override('external_network', fakes.NAME_OS_PUBLIC_NETWORK)
self.configure(external_network=fakes.NAME_OS_PUBLIC_NETWORK)
self.neutron.list_networks.return_value = (
{'networks': [{'id': fakes.ID_OS_PUBLIC_NETWORK}]})
self.neutron.create_floatingip.return_value = (

4
ec2api/tests/unit/test_dhcp_options.py
View File

@ -21,9 +21,6 @@ from ec2api.tests.unit import matchers
from ec2api.tests.unit import tools
CONF = cfg.CONF
class DhcpOptionsTestCase(base.ApiTestCase):
def test_create_dhcp_options(self):
@ -178,6 +175,7 @@ class DhcpOptionsTestCase(base.ApiTestCase):
mock.ANY, vpc)
def _effective_os_dhcp_options(self, os_dhcp_options):
CONF = cfg.CONF
dhcp_opts = {
'extra_dhcp_opts': [{'opt_name': 'mtu',
'opt_value': str(CONF.network_device_mtu)}]}

5
ec2api/tests/unit/test_image.py
View File

@ -19,7 +19,6 @@ import tempfile
import eventlet
import mock
from oslo_config import cfg
from oslotest import base as test_base
from ec2api.api import image as image_api
@ -544,9 +543,7 @@ class S3TestCase(base.ApiTestCase):
@mock.patch.object(fakes.OSImage, 'update', autospec=True)
def test_s3_create_image_locations(self, osimage_update):
conf = cfg.CONF
conf.set_override('image_decryption_dir', None)
self.addCleanup(conf.reset)
self.configure(image_decryption_dir=None)
_handle, tempf = tempfile.mkstemp()
fake_context = self._create_context()
with mock.patch(

9
ec2api/tests/unit/test_internet_gateway.py
View File

@ -15,7 +15,6 @@
import mock
from neutronclient.common import exceptions as neutron_exception
from oslo_config import cfg
from ec2api.tests.unit import base
from ec2api.tests.unit import fakes
@ -43,9 +42,7 @@ class IgwTestCase(base.ApiTestCase):
mock.ANY, 'igw', {})
def test_attach_igw(self):
conf = cfg.CONF
self.addCleanup(conf.reset)
conf.set_override('external_network', fakes.NAME_OS_PUBLIC_NETWORK)
self.configure(external_network=fakes.NAME_OS_PUBLIC_NETWORK)
self.set_mock_db_items(fakes.DB_IGW_1, fakes.DB_IGW_2, fakes.DB_VPC_2)
self.neutron.list_networks.return_value = (
{'networks': [{'id': fakes.ID_OS_PUBLIC_NETWORK}]})
@ -101,9 +98,7 @@ class IgwTestCase(base.ApiTestCase):
do_check('InvalidParameterValue')
def test_attach_igw_rollback(self):
conf = cfg.CONF
self.addCleanup(conf.reset)
conf.set_override('external_network', fakes.NAME_OS_PUBLIC_NETWORK)
self.configure(external_network=fakes.NAME_OS_PUBLIC_NETWORK)
self.set_mock_db_items(fakes.DB_IGW_1, fakes.DB_IGW_2, fakes.DB_VPC_2)
self.neutron.list_networks.return_value = (
{'networks': [{'id': fakes.ID_OS_PUBLIC_NETWORK}]})

29
ec2api/tests/unit/test_metadata.py
View File

@ -14,6 +14,7 @@
import mock
from oslo_config import cfg
from oslo_config import fixture as config_fixture
from oslotest import base as test_base
import testtools
import webob
@ -29,21 +30,19 @@ class ProxyTestCase(test_base.BaseTestCase):
def setUp(self):
super(ProxyTestCase, self).setUp()
self.handler = metadata.MetadataRequestHandler()
conf = cfg.CONF
self.addCleanup(conf.reset)
conf.set_override('nova_metadata_ip', '9.9.9.9', group='metadata')
conf.set_override('nova_metadata_port', 8775, group='metadata')
conf.set_override('nova_metadata_protocol', 'http', group='metadata')
conf.set_override('nova_metadata_insecure', True, group='metadata')
conf.set_override('auth_ca_cert', None, group='metadata')
conf.set_override('nova_client_cert', 'nova_cert', group='metadata')
conf.set_override('nova_client_priv_key', 'nova_priv_key',
group='metadata')
conf.set_override('admin_user', 'admin', group='metadata')
conf.set_override('admin_password', 'password', group='metadata')
conf.set_override('admin_tenant_name', 'service', group='metadata')
conf.set_override('metadata_proxy_shared_secret', 'secret',
group='metadata')
conf = config_fixture.Config()
conf.config(group='metadata',
nova_metadata_ip='9.9.9.9',
nova_metadata_port=8775,
nova_metadata_protocol='http',
nova_metadata_insecure=True,
auth_ca_cert=None,
nova_client_cert='nova_cert',
nova_client_priv_key='nova_priv_key',
admin_user='admin',
admin_password='password',
admin_tenant_name='service',
metadata_proxy_shared_secret='secret')
@mock.patch('ec2api.metadata.api.get_version_list')
def test_callable(self, get_version_list):