Merge "Make MessageRegistryFile.Registry attribute non-required"

This commit is contained in:
Zuul 2020-03-24 19:49:13 +00:00 committed by Gerrit Code Review
commit 439eb8e997
2 changed files with 11 additions and 1 deletions

View File

@ -66,7 +66,7 @@ class MessageRegistryFile(base.ResourceBase):
languages = base.Field('Languages', required=True)
"""List of RFC 5646 language codes supported by this resource"""
registry = base.Field('Registry', required=True)
registry = base.Field('Registry', required=True, default='UNKNOWN.0.0')
"""Prefix for MessageId used for messages from this resource
This attribute is in form Registry_name.Major_version.Minor_version

View File

@ -233,6 +233,16 @@ class MessageRegistryFileTestCase(base.TestCase):
'No message registry found for %(language)s or default',
{'language': 'en'})
@mock.patch('sushy.resources.base.logging.warning',
autospec=True)
def test__parse_attributes_missing_registry(self, mock_log):
self.json_doc.pop('Registry')
self.reg_file._parse_attributes(self.json_doc)
self.assertEqual('UNKNOWN.0.0', self.reg_file.registry)
mock_log.assert_called_with(
'Applying default "UNKNOWN.0.0" on required, but missing '
'attribute "[\'Registry\']"')
class MessageRegistryFileCollectionTestCase(base.TestCase):