From 3a355c3b78ba6762a2c2e214616454390913787d Mon Sep 17 00:00:00 2001 From: Martin Kosek Date: Tue, 30 Aug 2011 17:10:27 +0200 Subject: Fix sudo help and summaries 1) Add sudorule docstring headline 2) Fix naming inconsistency in Sudo plugins help and summaries, especially capitalization of Sudo objects - Sudo Rule, Sudo Command and Sudo Command Group 3) Add missing summaries for sudorule-add-option and sudorule-remove-option. To keep backward compatibility with older clients, just print the missing summary with output_for_cli(), don't expand Output. https://fedorahosted.org/freeipa/ticket/1595 https://fedorahosted.org/freeipa/ticket/1596 --- tests/test_xmlrpc/test_sudocmd_plugin.py | 8 ++++---- tests/test_xmlrpc/test_sudocmdgroup_plugin.py | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'tests') diff --git a/tests/test_xmlrpc/test_sudocmd_plugin.py b/tests/test_xmlrpc/test_sudocmd_plugin.py index a19fefc73..cbbd26cd7 100644 --- a/tests/test_xmlrpc/test_sudocmd_plugin.py +++ b/tests/test_xmlrpc/test_sudocmd_plugin.py @@ -67,7 +67,7 @@ class test_sudocmd(Declarative): ), expected=dict( value=sudocmd1, - summary=u'Added sudo command "%s"' % sudocmd1, + summary=u'Added Sudo Command "%s"' % sudocmd1, result=dict( dn=lambda x: DN(x) == \ DN(('sudocmd',sudocmd1),('cn','sudocmds'),('cn','sudo'), @@ -115,7 +115,7 @@ class test_sudocmd(Declarative): expected=dict( count=1, truncated=False, - summary=u'1 sudo command matched', + summary=u'1 Sudo Command matched', result=[ dict( dn=lambda x: DN(x) == \ @@ -135,7 +135,7 @@ class test_sudocmd(Declarative): description=u'Updated sudo command 1')), expected=dict( value=sudocmd1, - summary=u'Modified sudo command "%s"' % sudocmd1, + summary=u'Modified Sudo Command "%s"' % sudocmd1, result=dict( sudocmd=[sudocmd1], description=[u'Updated sudo command 1'], @@ -166,7 +166,7 @@ class test_sudocmd(Declarative): command=('sudocmd_del', [sudocmd1], {}), expected=dict( value=sudocmd1, - summary=u'Deleted sudo command "%s"' % sudocmd1, + summary=u'Deleted Sudo Command "%s"' % sudocmd1, result=dict(failed=u''), ), ), diff --git a/tests/test_xmlrpc/test_sudocmdgroup_plugin.py b/tests/test_xmlrpc/test_sudocmdgroup_plugin.py index dd89c5d17..8a534b2bf 100644 --- a/tests/test_xmlrpc/test_sudocmdgroup_plugin.py +++ b/tests/test_xmlrpc/test_sudocmdgroup_plugin.py @@ -47,7 +47,7 @@ class test_sudocmdgroup(Declarative): ), expected=dict( value=sudocmd1, - summary=u'Added sudo command "%s"' % sudocmd1, + summary=u'Added Sudo Command "%s"' % sudocmd1, result=dict( objectclass=objectclasses.sudocmd, sudocmd=[u'/usr/bin/sudotestcmd1'], @@ -110,7 +110,7 @@ class test_sudocmdgroup(Declarative): ), expected=dict( value=sudocmdgroup1, - summary=u'Added sudo command group "testsudocmdgroup1"', + summary=u'Added Sudo Command Group "testsudocmdgroup1"', result=dict( cn=[sudocmdgroup1], description=[u'Test desc 1'], @@ -162,7 +162,7 @@ class test_sudocmdgroup(Declarative): cn=[sudocmdgroup1], description=[u'New desc 1'], ), - summary=u'Modified sudo command group "testsudocmdgroup1"', + summary=u'Modified Sudo Command Group "testsudocmdgroup1"', value=sudocmdgroup1, ), ), @@ -200,7 +200,7 @@ class test_sudocmdgroup(Declarative): description=[u'New desc 1'], ), ], - summary=u'1 sudo command group matched', + summary=u'1 Sudo Command Group matched', ), ), @@ -238,7 +238,7 @@ class test_sudocmdgroup(Declarative): ), expected=dict( value=sudocmdgroup2, - summary=u'Added sudo command group "testsudocmdgroup2"', + summary=u'Added Sudo Command Group "testsudocmdgroup2"', result=dict( cn=[sudocmdgroup2], description=[u'Test desc 2'], @@ -290,7 +290,7 @@ class test_sudocmdgroup(Declarative): cn=[sudocmdgroup2], description=[u'New desc 2'], ), - summary=u'Modified sudo command group "testsudocmdgroup2"', + summary=u'Modified Sudo Command Group "testsudocmdgroup2"', value=sudocmdgroup2, ), ), @@ -328,7 +328,7 @@ class test_sudocmdgroup(Declarative): description=[u'New desc 2'], ), ], - summary=u'1 sudo command group matched', + summary=u'1 Sudo Command Group matched', ), ), @@ -337,7 +337,7 @@ class test_sudocmdgroup(Declarative): desc='Search for all sudocmdgroups', command=('sudocmdgroup_find', [], {}), expected=dict( - summary=u'2 sudo command groups matched', + summary=u'2 Sudo Command Groups matched', count=2, truncated=False, result=[ @@ -482,7 +482,7 @@ class test_sudocmdgroup(Declarative): expected=dict( result=dict(failed=u''), value=sudocmdgroup1, - summary=u'Deleted sudo command group "testsudocmdgroup1"', + summary=u'Deleted Sudo Command Group "testsudocmdgroup1"', ) ), @@ -517,7 +517,7 @@ class test_sudocmdgroup(Declarative): expected=dict( result=dict(failed=u''), value=sudocmdgroup2, - summary=u'Deleted sudo command group "testsudocmdgroup2"', + summary=u'Deleted Sudo Command Group "testsudocmdgroup2"', ) ), @@ -552,7 +552,7 @@ class test_sudocmdgroup(Declarative): expected=dict( result=dict(failed=u''), value=sudocmd1, - summary=u'Deleted sudo command "%s"' % sudocmd1, + summary=u'Deleted Sudo Command "%s"' % sudocmd1, ) ), -- cgit