From f385a5821f99f369972d58804d0b05db91193bc3 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 3 May 2018 11:46:05 -0700 Subject: [PATCH] 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 --- nodepool/tests/__init__.py | 2 +- nodepool/tests/test_shade_integration.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nodepool/tests/__init__.py b/nodepool/tests/__init__.py index 7561874ab..6cae2fc16 100644 --- a/nodepool/tests/__init__.py +++ b/nodepool/tests/__init__.py @@ -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, diff --git a/nodepool/tests/test_shade_integration.py b/nodepool/tests/test_shade_integration.py index 8c87ba42d..625333a54 100644 --- a/nodepool/tests/test_shade_integration.py +++ b/nodepool/tests/test_shade_integration.py @@ -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: