From 1468538414df4e5cf836a9eff33bfba8c41953f9 Mon Sep 17 00:00:00 2001
From: Adrian Likins <alikins@redhat.com>
Date: Sat, 26 Mar 2016 03:22:37 -0400
Subject: [PATCH] galaxy info displayed 'galaxy_info' section wrong

The output of 'ansible-galaxy info' was formatting the
'galaxy_info' key with one char per line.

Previously, when building the output string, items in
role_info that had a dict for value, the label for
it's key ('galaxy_info' for ex) was being added to
the text list in addition to being appended. Only
the append is needed.

Also added a unit test in test/units/cli/test_galaxy.py,
but skip it on py3 until galaxy is py3 compatible.

fixes #15177
---
 lib/ansible/cli/galaxy.py     |  1 -
 test/units/cli/__init__.py    |  0
 test/units/cli/test_galaxy.py | 53 +++++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 test/units/cli/__init__.py
 create mode 100644 test/units/cli/test_galaxy.py

diff --git a/lib/ansible/cli/galaxy.py b/lib/ansible/cli/galaxy.py
index 1e33e057af7..3a3b58270dd 100644
--- a/lib/ansible/cli/galaxy.py
+++ b/lib/ansible/cli/galaxy.py
@@ -152,7 +152,6 @@ class GalaxyCLI(CLI):
                 continue
 
             if isinstance(role_info[k], dict):
-                text += "\t%s: \n" % (k)
                 text.append(u"\t%s:" % (k))
                 for key in sorted(role_info[k].keys()):
                     if key in self.SKIP_INFO_KEYS:
diff --git a/test/units/cli/__init__.py b/test/units/cli/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/units/cli/test_galaxy.py b/test/units/cli/test_galaxy.py
new file mode 100644
index 00000000000..faea529242d
--- /dev/null
+++ b/test/units/cli/test_galaxy.py
@@ -0,0 +1,53 @@
+# (c) 2016, Adrian Likins <alikins@redhat.com>
+#
+# This file is part of Ansible
+#
+# Ansible is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ansible is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+from ansible.compat.six import PY3
+from ansible.compat.tests import unittest
+
+from nose.plugins.skip import SkipTest
+
+if PY3:
+    raise SkipTest('galaxy is not ported to be py3 compatible yet')
+
+from ansible.cli.galaxy import GalaxyCLI
+
+class TestGalaxy(unittest.TestCase):
+    def setUp(self):
+        self.default_args = []
+
+    def test_init(self):
+        galaxy_cli = GalaxyCLI(args=self.default_args)
+        self.assertTrue(isinstance(galaxy_cli, GalaxyCLI))
+
+    def test_display_min(self):
+        gc = GalaxyCLI(args=self.default_args)
+        role_info = {'name': 'some_role_name'}
+        display_result = gc._display_role_info(role_info)
+        self.assertTrue(display_result.find('some_role_name') >-1)
+
+    def test_display_galaxy_info(self):
+        gc = GalaxyCLI(args=self.default_args)
+        galaxy_info = {}
+        role_info = {'name': 'some_role_name',
+                     'galaxy_info': galaxy_info}
+        display_result = gc._display_role_info(role_info)
+        if display_result.find('\t\tgalaxy_tags:') > -1:
+            self.fail('Expected galaxy_tags to be indented twice')