openstack/deb-sahara
Code Issues Proposed changes

Remove explicit set of CONF.os_region_name in mapr plugin tests

Browse Source 
The explicit set of os_region_name to None breaks subsequent
unit tests running in the same worker process that attempt to
override os_region_name.  Any setting of os_region_name in unit
tests should use the set_override or set_default methods available
in oslo.config.

Close-bug: 1384875
Change-Id: Iea2eb58dc3d8e8667795495c6cc1f68538d524b6
This commit is contained in:
Trevor McKay 2014-10-23 15:33:47 -04:00
parent f86926352e
commit ef12833119
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sahara/tests/unit/plugins/mapr/versions/test_base_cluster_configurer.py
View File

@ -20,7 +20,6 @@ import six
import sahara.plugins.mapr.util.config_file_utils as cfu
import sahara.plugins.mapr.util.plugin_spec as ps
import sahara.plugins.mapr.versions.v4_0_1_mrv1.cluster_configurer as bcc
import sahara.swift.swift_helper as sh
import sahara.tests.unit.base as b
import sahara.tests.unit.plugins.mapr.stubs as s
import sahara.utils.files as f
@ -53,7 +52,6 @@ class BaseClusterConfigurerTest(b.SaharaTestCase):
cc_mock.return_value = s.AttrDict(auth_uri='http://auth',
tenant_name='tenant_0',
tenant_id='tenant_id')
sh.CONF.os_region_name = None
i0 = s.Instance(instance_name='i0',
management_ip='192.168.1.10',
@ -137,7 +135,7 @@ class BaseClusterConfigurerTest(b.SaharaTestCase):
cc_mock.return_value = s.AttrDict(auth_uri='http://auth',
tenant_name='tenant_0',
tenant_id='tenant_id')
sh.CONF.os_region_name = None
i0 = s.Instance(instance_name='i0',
management_ip='192.168.1.10',
internal_ip='10.10.1.10')