From 2c381a15e613f60c0f7dcddff9ba7626298e2040 Mon Sep 17 00:00:00 2001
From: Jens Rosenboom <j.rosenboom@x-ion.de>
Date: Mon, 9 Mar 2015 21:51:49 +0100
Subject: [PATCH] Fix printing too much output for show secgroup

Due to wrong indentation, the array of security groups was
printed multiple times while being filled.

Change-Id: I1ce1a1d39d0be07e991fa7e118c0565f39edf891
Closes-Bug: #1423610
---
 rally/cmd/commands/show.py           |  8 ++++----
 tests/unit/cmd/commands/test_show.py | 11 +++++++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/rally/cmd/commands/show.py b/rally/cmd/commands/show.py
index fddcc5a0ed..cac5c80f8b 100644
--- a/rally/cmd/commands/show.py
+++ b/rally/cmd/commands/show.py
@@ -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)
diff --git a/tests/unit/cmd/commands/test_show.py b/tests/unit/cmd/commands/test_show.py
index c40b9b2f6d..a5f72fbbdb 100644
--- a/tests/unit/cmd/commands/test_show.py
+++ b/tests/unit/cmd/commands/test_show.py
@@ -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)