Remove explicit set of CONF.os_region_name in mapr plugin tests
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:
parent
f86926352e
commit
ef12833119
@ -20,7 +20,6 @@ import six
|
|||||||
import sahara.plugins.mapr.util.config_file_utils as cfu
|
import sahara.plugins.mapr.util.config_file_utils as cfu
|
||||||
import sahara.plugins.mapr.util.plugin_spec as ps
|
import sahara.plugins.mapr.util.plugin_spec as ps
|
||||||
import sahara.plugins.mapr.versions.v4_0_1_mrv1.cluster_configurer as bcc
|
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.base as b
|
||||||
import sahara.tests.unit.plugins.mapr.stubs as s
|
import sahara.tests.unit.plugins.mapr.stubs as s
|
||||||
import sahara.utils.files as f
|
import sahara.utils.files as f
|
||||||
@ -53,7 +52,6 @@ class BaseClusterConfigurerTest(b.SaharaTestCase):
|
|||||||
cc_mock.return_value = s.AttrDict(auth_uri='http://auth',
|
cc_mock.return_value = s.AttrDict(auth_uri='http://auth',
|
||||||
tenant_name='tenant_0',
|
tenant_name='tenant_0',
|
||||||
tenant_id='tenant_id')
|
tenant_id='tenant_id')
|
||||||
sh.CONF.os_region_name = None
|
|
||||||
|
|
||||||
i0 = s.Instance(instance_name='i0',
|
i0 = s.Instance(instance_name='i0',
|
||||||
management_ip='192.168.1.10',
|
management_ip='192.168.1.10',
|
||||||
@ -137,7 +135,7 @@ class BaseClusterConfigurerTest(b.SaharaTestCase):
|
|||||||
cc_mock.return_value = s.AttrDict(auth_uri='http://auth',
|
cc_mock.return_value = s.AttrDict(auth_uri='http://auth',
|
||||||
tenant_name='tenant_0',
|
tenant_name='tenant_0',
|
||||||
tenant_id='tenant_id')
|
tenant_id='tenant_id')
|
||||||
sh.CONF.os_region_name = None
|
|
||||||
i0 = s.Instance(instance_name='i0',
|
i0 = s.Instance(instance_name='i0',
|
||||||
management_ip='192.168.1.10',
|
management_ip='192.168.1.10',
|
||||||
internal_ip='10.10.1.10')
|
internal_ip='10.10.1.10')
|
||||||
|
Loading…
Reference in New Issue
Block a user