Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix APB name parse #821

Merged
merged 1 commit into from
Jul 3, 2018
Merged

Fix APB name parse #821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions galaxy/importer/loaders/apb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ def _check_async(self):

def parse_name(self):
fieldname = 'name'
name = self._get_key(fieldname)
name = sanitize_content_name(self._get_key(fieldname))
if not re.match('^[a-z0-9_]+$', name):
raise exc.APBContentLoadError(
'Invalid "{0}" value in metadata. Must contain only lowercase '
Expand Down Expand Up @@ -190,7 +190,7 @@ def load(self):
self.log.info('Loading metadata file: {0}'.format(self.metadata_file))
metadata = self._load_metadata()
meta_parser = APBMetaParser(metadata, logger=self.log)
name = sanitize_content_name(meta_parser.parse_name())
name = meta_parser.parse_name()
description = meta_parser.parse_description()
meta_parser.check_data()
data = {'tags': meta_parser.parse_tags()}
Expand Down
4 changes: 2 additions & 2 deletions galaxy/importer/tests/test_apb_loader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ def test_invalid_tags(self):
def test_parse_name(self):
parser = apb_loader.APBMetaParser(self.data, self.log)
name = parser.parse_name()
assert name == 'mssql-apb'
assert name == 'mssql_apb'

def test_parse_description(self):
parser = apb_loader.APBMetaParser(self.data, self.log)
Expand Down Expand Up @@ -354,7 +354,7 @@ def test_load_role(self, load_metadata_mock):
role_meta = apb.role_meta
metadata = apb.metadata['apb_metadata']

assert apb.name == 'mssql-apb'
assert apb.name == 'mssql_apb'
assert len(metadata['metadata']['dependencies']) == 1
assert apb.description == 'Deployment of Microsoft SQL Server on Linux'
assert role_meta['tags'] == ['database', 'mssql']