From b3c41f21e51e5389d95b5486dcdfdc3f9a8b0424 Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Thu, 12 Jan 2017 18:38:37 +0530 Subject: [PATCH] Add fix for ipa plugins command Fix adds count of plugins loaded to return dict Fixes https://fedorahosted.org/freeipa/ticket/6513 Signed-off-by: Abhijeet Kasurde Reviewed-By: Martin Basti Reviewed-By: Martin Babinsky --- ipalib/misc.py | 3 ++- ipatests/test_cmdline/test_cli.py | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ipalib/misc.py b/ipalib/misc.py index 687b018fe..a5f9b6daa 100644 --- a/ipalib/misc.py +++ b/ipalib/misc.py @@ -124,8 +124,9 @@ class plugins(LocalOrRemote): for plugin in self.api[namespace](): cls = type(plugin) key = '{}.{}'.format(cls.__module__, cls.__name__) - result.setdefault(key, []).append(namespace) + result.setdefault(key, []).append(namespace.decode('utf-8')) return dict( result=result, + count=len(result), ) diff --git a/ipatests/test_cmdline/test_cli.py b/ipatests/test_cmdline/test_cli.py index 07bab233c..4585126d9 100644 --- a/ipatests/test_cmdline/test_cli.py +++ b/ipatests/test_cmdline/test_cli.py @@ -51,6 +51,9 @@ class TestCLIParsing(object): def test_ping(self): self.check_command('ping', 'ping') + def test_plugins(self): + self.check_command('plugins', 'plugins') + def test_user_show(self): self.check_command('user-show admin', 'user_show', uid=u'admin')