diff options
| -rw-r--r-- | .zuul.yaml | 8 | ||||
| -rw-r--r-- | glance_store/common/fs_mount.py | 2 | ||||
| -rw-r--r-- | glance_store/tests/unit/test_opts.py | 29 |
3 files changed, 22 insertions, 17 deletions
@@ -51,6 +51,7 @@ parent: tox abstract: true description: Abstract job for glance_store vs. cinder + nodeset: ubuntu-focal required-projects: - name: openstack/os-brick - name: openstack/python-cinderclient @@ -60,6 +61,7 @@ parent: glance_store-tox-cinder-tips-base description: | glance_store py36 unit tests vs. cinder masters + nodeset: ubuntu-bionic vars: tox_envlist: py36 @@ -68,6 +70,7 @@ parent: tox abstract: true description: Abstract job for glance_store vs. keystone + nodeset: ubuntu-focal required-projects: - name: openstack/keystoneauth - name: openstack/python-keystoneclient @@ -77,6 +80,7 @@ parent: glance_store-tox-keystone-tips-base description: | glance_store py36 unit tests vs. keystone masters + nodeset: ubuntu-bionic vars: tox_envlist: py36 @@ -85,6 +89,7 @@ parent: tox abstract: true description: Abstract job for glance_store vs. oslo + nodeset: ubuntu-focal required-projects: - name: openstack/oslo.concurrency - name: openstack/oslo.config @@ -101,6 +106,7 @@ parent: glance_store-tox-oslo-tips-base description: | glance_store py36 unit tests vs. oslo masters + nodeset: ubuntu-bionic vars: tox_envlist: py36 @@ -109,6 +115,7 @@ parent: tox abstract: true description: Abstract job for glance_store vs. swift + nodeset: ubuntu-focal required-projects: - name: openstack/python-swiftclient @@ -117,6 +124,7 @@ parent: glance_store-tox-swift-tips-base description: | glance_store py36 unit tests vs. swift masters + nodeset: ubuntu-bionic vars: tox_envlist: py36 diff --git a/glance_store/common/fs_mount.py b/glance_store/common/fs_mount.py index 3983f8b..67e4a7f 100644 --- a/glance_store/common/fs_mount.py +++ b/glance_store/common/fs_mount.py @@ -119,7 +119,7 @@ class _HostMountStateManager(metaclass=HostMountStateManagerMeta): os.rmdir(dir) except Exception as ex: LOG.debug( - "Couldn't remove directory" + "Couldn't remove directory " "%(mountpoint)s: %(reason)s", {'mountpoint': mountpoint, 'reason': ex}) diff --git a/glance_store/tests/unit/test_opts.py b/glance_store/tests/unit/test_opts.py index 5ec31a4..5cc184b 100644 --- a/glance_store/tests/unit/test_opts.py +++ b/glance_store/tests/unit/test_opts.py @@ -13,23 +13,15 @@ # License for the specific language governing permissions and limitations # under the License. -import pkg_resources +import stevedore from testtools import matchers from glance_store import backend from glance_store.tests import base -def load_entry_point(entry_point, verify_requirements=False): - """Load an entry-point without requiring dependencies.""" - resolve = getattr(entry_point, 'resolve', None) - require = getattr(entry_point, 'require', None) - if resolve is not None and require is not None: - if verify_requirements: - entry_point.require() - return entry_point.resolve() - else: - return entry_point.load(require=verify_requirements) +def on_load_failure_callback(*args, **kwargs): + raise class OptsTestCase(base.StoreBaseTest): @@ -53,11 +45,16 @@ class OptsTestCase(base.StoreBaseTest): def _test_entry_point(self, namespace, expected_opt_groups, expected_opt_names): opt_list = None - for ep in pkg_resources.iter_entry_points('oslo.config.opts'): - if ep.name == namespace: - list_fn = load_entry_point(ep) - opt_list = list_fn() - break + mgr = stevedore.NamedExtensionManager( + 'oslo.config.opts', + names=[namespace], + invoke_on_load=False, + on_load_failure_callback=on_load_failure_callback, + ) + for ext in mgr: + list_fn = ext.plugin + opt_list = list_fn() + break self.assertIsNotNone(opt_list) |