Merge lp:~sergiusens/snapcraft/1510954 into lp:~snappy-dev/snapcraft/core

[Sergio Schvezov]

Listing plugins on help should not raise an exception

[Daniel Holbach (dholbach)]

Good work. Thanks.

review: Approve

=== modified file 'snapcraft/help.py'
--- snapcraft/help.py	2015-10-27 20:21:36 +0000
+++ snapcraft/help.py	2015-10-28 15:24:34 +0000
@@ -61,13 +61,12 @@
     try:
         module = importlib.import_module(
             'snapcraft.plugins.{}'.format(module_name))
+        if module.__doc__ and devel:
+            help(module)
+        elif module.__doc__:
+            print(module.__doc__)
+        else:
+            print('The plugin has no documentation')
     except ImportError:
         logger.error('The plugin does not exist. Use one of the following:')
         cmds.list_plugins()
-
-    if module.__doc__ and devel:
-        help(module)
-    elif module.__doc__:
-        print(module.__doc__)
-    else:
-        print('The plugin has no documentation')

=== added file 'snapcraft/tests/test_help.py'
--- snapcraft/tests/test_help.py	1970-01-01 00:00:00 +0000
+++ snapcraft/tests/test_help.py	2015-10-28 15:24:34 +0000
@@ -0,0 +1,38 @@
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4 -*-
+#
+# Copyright (C) 2015 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import fixtures
+
+from unittest import mock
+
+from snapcraft import help
+from snapcraft import tests
+
+
+class CommonTestCase(tests.TestCase):
+
+    @mock.patch('snapcraft.cmds.list_plugins')
+    def test_topic_and_plugin_not_found_lists_plugins(self, mock_list):
+        fake_logger = fixtures.FakeLogger()
+        self.useFixture(fake_logger)
+
+        class Args:
+            topic = 'does-not-exist'
+            devel = False
+
+        help.topic(Args())
+        self.assertTrue(mock_list.called)
+        self.assertEqual(mock_list.call_count, 1)