openstack
/
sushy
Code Issues Proposed changes

Merge "Cleanup for Standard message registry loading"

This commit is contained in:
Zuul 2019-05-24 09:09:02 +00:00 committed by Gerrit Code Review
parent 74e37a7420 6cb68f89f5
commit f21e4f500e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sushy/main.py
View File

@ -328,6 +328,7 @@ class Sushy(base.ResourceBase):
resource_package_name = __name__
for json_file in pkg_resources.resource_listdir(
resource_package_name, STANDARD_REGISTRY_PATH):
# Not using path.join according to pkg_resources docs
mes_reg = message_registry.MessageRegistry(
None, STANDARD_REGISTRY_PATH + json_file,
reader=base.JsonPackagedFileReader(resource_package_name))

3
sushy/tests/unit/test_main.py
View File

@ -191,8 +191,7 @@ class MainTestCase(base.TestCase):
registries = self.root._get_standard_message_registry_collection()
self.assertEqual(5, len(registries))
self.assertTrue([r.identity for r in registries
if r.identity == 'Base.1.3.0'])
self.assertIn('Base.1.3.0', {r.identity for r in registries})
@mock.patch('sushy.Sushy._get_standard_message_registry_collection',
autospec=True)