openstack/rally
Code Issues Proposed changes

Merge "Fix printing too much output for show secgroup"

Browse Source
This commit is contained in:
Jenkins 2015-03-10 11:52:16 +00:00 committed by Gerrit Code Review
commit fe7570a158
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rally/cmd/commands/show.py
View File

@ -163,10 +163,10 @@ class ShowCommands(object):
secgroup.description]
table_rows.append(utils.Struct(**dict(zip(headers,
data))))
cliutils.print_list(
table_rows,
fields=headers,
mixed_case_fields=mixed_case_fields)
cliutils.print_list(
table_rows,
fields=headers,
mixed_case_fields=mixed_case_fields)
except exceptions.InvalidArgumentsException as e:
print(_("Authentication Issues: %s") % e)

11
tests/unit/cmd/commands/test_show.py
View File

@ -126,9 +126,13 @@ class ShowCommandsTestCase(test.TestCase):
@mock.patch("rally.cmd.commands.show.db.deployment_get")
def test_secgroups(self, mock_deployment_get, mock_get_nova,
mock_struct, mock_print_list):
self.fake_nova_client.security_groups.create("othersg")
fake_secgroup = list(
self.fake_nova_client.security_groups.cache.values())[0]
fake_secgroup.id = 0
fake_secgroup2 = list(
self.fake_nova_client.security_groups.cache.values())[1]
fake_secgroup2.id = 1
mock_get_nova.return_value = self.fake_nova_client
mock_deployment_get.return_value = {"admin": self.fake_endpoint}
self.show.secgroups(self.fake_deployment_id)
@ -137,11 +141,14 @@ class ShowCommandsTestCase(test.TestCase):
headers = ["ID", "Name", "Description"]
fake_data = [fake_secgroup.id, fake_secgroup.name, ""]
mock_struct.assert_called_once_with(**dict(zip(headers, fake_data)))
fake_data2 = [fake_secgroup2.id, fake_secgroup2.name, ""]
calls = [mock.call(**dict(zip(headers, fake_data))),
mock.call(**dict(zip(headers, fake_data2)))]
mock_struct.assert_has_calls(calls, any_order=True)
mixed_case_fields = ["ID", "Name", "Description"]
mock_print_list.assert_called_once_with(
[mock_struct()],
[mock_struct(), mock_struct()],
fields=headers,
mixed_case_fields=mixed_case_fields)