openstack/python-solumclient
Code Issues Proposed changes

Merge "Bugfix when submitting language pack"

Browse Source
This commit is contained in:
Jenkins
2014-06-05 21:57:18 +00:00
committed by Gerrit Code Review
parent 5034c5ab59 642f3e268d
commit a637d905ff
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
solumclient/solum.py
View File

@@ -174,8 +174,7 @@ class LanguagePackCommands(cli_utils.CommandsBase):
print("Error in language pack file: %s", str(exc)) print("Error in language pack file: %s", str(exc))
sys.exit(1) sys.exit(1)
json_data = json.dumps(data) languagepack = self.client.languagepacks.create(**data)
languagepack = self.client.languagepacks.create(json_data)
fields = ['uuid', 'name', 'description', 'compiler_versions', fields = ['uuid', 'name', 'description', 'compiler_versions',
'os_platform'] 'os_platform']
data = dict([(f, getattr(languagepack, f, '')) data = dict([(f, getattr(languagepack, f, ''))

30
solumclient/tests/test_solum.py
View File

@@ -48,6 +48,9 @@ plan_file_data = (
' href: https://github.com/paulczar/example-nodejs-express.git\n' ' href: https://github.com/paulczar/example-nodejs-express.git\n'
' language_pack: auto') ' language_pack: auto')
languagepack_file_data = (
'{"language-pack-type":"Java", "language-pack-name":"Java version 1.4."}')
class MockEntrypoint(object): class MockEntrypoint(object):
def __init__(self, name, plugin): def __init__(self, name, plugin):
@@ -224,16 +227,25 @@ class TestSolum(base.TestCase):
self.shell("languagepack list") self.shell("languagepack list")
mock_lp_list.assert_called_once() mock_lp_list.assert_called_once()
@mock.patch.object(json, "load") @mock.patch.object(cliutils, "print_dict")
@mock.patch.object(languagepack.LanguagePackManager, "create") @mock.patch.object(languagepack.LanguagePackManager, "create")
def test_languagepack_create(self, mock_lp_create, mock_json_load): def test_languagepack_create(self, mock_lp_create, mock_print_dict):
mock_json_load.side_effect = """{ FakeResource = collections.namedtuple("FakeResource",
"language-pack-type": "Java", "uuid name description "
"language-pack-name": "Java version 1.4.", "compiler_versions os_platform")
}"""
self.make_env() mock_lp_create.return_value = FakeResource(
self.shell("languagepack create /dev/null") 'foo', 'foo', 'foo', 'foo', 'foo')
mock_lp_create.assert_called_once() expected_printed_dict_args = mock_lp_create.return_value._asdict()
lp_data = json.loads(languagepack_file_data)
mopen = mock.mock_open(read_data=languagepack_file_data)
with mock.patch('%s.open' % solum.__name__, mopen, create=True):
self.make_env()
self.shell("languagepack create /dev/null")
mock_lp_create.assert_called_once_with(**lp_data)
mock_print_dict.assert_called_once_with(
expected_printed_dict_args,
wrap=72)
@mock.patch.object(languagepack.LanguagePackManager, "delete") @mock.patch.object(languagepack.LanguagePackManager, "delete")
def test_languagepack_delete(self, mock_lp_delete): def test_languagepack_delete(self, mock_lp_delete):