diff options
| author | Abhijeet Kasurde <akasurde@redhat.com> | 2017-01-12 18:38:37 +0530 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2017-02-17 10:22:07 +0100 |
| commit | b3c41f21e51e5389d95b5486dcdfdc3f9a8b0424 (patch) | |
| tree | 1df544721816dfa09eff9849812ba60f5011b1b3 | |
| parent | 66867319d903f7693a535471d3b81716a258ce9d (diff) | |
| download | freeipa-b3c41f21e51e5389d95b5486dcdfdc3f9a8b0424.tar.gz freeipa-b3c41f21e51e5389d95b5486dcdfdc3f9a8b0424.tar.xz freeipa-b3c41f21e51e5389d95b5486dcdfdc3f9a8b0424.zip | |
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 <akasurde@redhat.com>
Reviewed-By: Martin Basti <mbasti@redhat.com>
Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
| -rw-r--r-- | ipalib/misc.py | 3 | ||||
| -rw-r--r-- | ipatests/test_cmdline/test_cli.py | 3 |
2 files changed, 5 insertions, 1 deletions
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') |