zuul
/
nodepool
Code Issues Proposed changes

Fix test patching of clouds.yaml file locations 

OpenStack Client Config has been pulled into openstacksdk. As part of
this work OSCC internals were dropped and aliased into the sdk lib. This
move broke patching of the clouds.yaml file location for nodepool tests.

We quickly work around this by using the new location for the value to
be overridden in openstacksdk.

Change-Id: I55ad4333ffddec8eeb023e345156e96773504400
This commit is contained in:
Clark Boylan 2018-05-03 11:46:05 -07:00
parent 2ef5670f1d
commit f385a5821f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nodepool/tests/__init__.py
View File

@ -192,7 +192,7 @@ class BaseTestCase(testtools.TestCase):
clouds_path = os.path.join(os.path.dirname(__file__),
'fixtures', 'clouds.yaml')
self.useFixture(fixtures.MonkeyPatch(
'os_client_config.config.CONFIG_FILES', [clouds_path]))
'openstack.config.loader.CONFIG_FILES', [clouds_path]))
def wait_for_threads(self):
# Wait until all transient threads (node launches, deletions,

2
nodepool/tests/test_shade_integration.py
View File

@ -32,7 +32,7 @@ class TestShadeIntegration(tests.IntegrationTestCase):
self.useFixture(config_dir)
self.clouds_path = os.path.join(config_dir.path, 'clouds.yaml')
self.useFixture(fixtures.MonkeyPatch(
'os_client_config.config.CONFIG_FILES',
'openstack.config.loader.CONFIG_FILES',
[self.clouds_path]))
with open(self.clouds_path, 'w') as h: