Merge "Cleanup for Standard message registry loading"
This commit is contained in:
commit
f21e4f500e
|
@ -328,6 +328,7 @@ class Sushy(base.ResourceBase):
|
||||||
resource_package_name = __name__
|
resource_package_name = __name__
|
||||||
for json_file in pkg_resources.resource_listdir(
|
for json_file in pkg_resources.resource_listdir(
|
||||||
resource_package_name, STANDARD_REGISTRY_PATH):
|
resource_package_name, STANDARD_REGISTRY_PATH):
|
||||||
|
# Not using path.join according to pkg_resources docs
|
||||||
mes_reg = message_registry.MessageRegistry(
|
mes_reg = message_registry.MessageRegistry(
|
||||||
None, STANDARD_REGISTRY_PATH + json_file,
|
None, STANDARD_REGISTRY_PATH + json_file,
|
||||||
reader=base.JsonPackagedFileReader(resource_package_name))
|
reader=base.JsonPackagedFileReader(resource_package_name))
|
||||||
|
|
|
@ -191,8 +191,7 @@ class MainTestCase(base.TestCase):
|
||||||
registries = self.root._get_standard_message_registry_collection()
|
registries = self.root._get_standard_message_registry_collection()
|
||||||
|
|
||||||
self.assertEqual(5, len(registries))
|
self.assertEqual(5, len(registries))
|
||||||
self.assertTrue([r.identity for r in registries
|
self.assertIn('Base.1.3.0', {r.identity for r in registries})
|
||||||
if r.identity == 'Base.1.3.0'])
|
|
||||||
|
|
||||||
@mock.patch('sushy.Sushy._get_standard_message_registry_collection',
|
@mock.patch('sushy.Sushy._get_standard_message_registry_collection',
|
||||||
autospec=True)
|
autospec=True)
|
||||||
|
|
Loading…
Reference in New Issue