This patch depends on my patch 0024 (but I can rebase if it needs to be pushed earlied).

It fixes some of the test bugs that would be found by a fix for https://fedorahosted.org/freeipa/ticket/2509 (Unknown Command arguments are allowed (and ignored)).


As you can see it's quite easy, without validation, to use a wrong name for an argument.

Unfortunately, some of our plugins (automount, dns, delegation, permission, selfservice) take advantage of the current sloppy validation, so they'll need some untangling for 3.x to make them more robust and testable. For now I'm just touching the tests, so we don't get new bugs in production code.

--
PetrĀ³
From e794bf4fe5d55e3313ec239e29397aaf934bb07d Mon Sep 17 00:00:00 2001
From: Petr Viktorin <pvikt...@redhat.com>
Date: Wed, 14 Mar 2012 11:33:41 -0400
Subject: [PATCH] Use valid argument names in tests

Some of our tests used unintended extra options, or options with
misspelled, wrongly copy-pasted or otherwise bad names. These are
ignored, so the intended argument was treated as missing. The test
itself can still pass but may be rendered ineffective or fragile.

This fixes some such errors. Actual rejecting of unknown arguments
is deferred for later (ticket #2509).
---
 tests/test_xmlrpc/test_automember_plugin.py |    5 +----
 tests/test_xmlrpc/test_delegation_plugin.py |    2 +-
 tests/test_xmlrpc/test_hbac_plugin.py       |    6 +++---
 tests/test_xmlrpc/test_hbactest_plugin.py   |    2 +-
 tests/test_xmlrpc/test_pwpolicy.py          |    2 +-
 tests/test_xmlrpc/test_role_plugin.py       |    2 +-
 tests/test_xmlrpc/test_sudorule_plugin.py   |    6 +++---
 7 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/tests/test_xmlrpc/test_automember_plugin.py b/tests/test_xmlrpc/test_automember_plugin.py
index 1241bd669c597c1363b86c4f378472031c3e6682..265c3af861b0bfd5ffa102e5fbb3a81857292996 100644
--- a/tests/test_xmlrpc/test_automember_plugin.py
+++ b/tests/test_xmlrpc/test_automember_plugin.py
@@ -718,10 +718,7 @@ class test_automember(Declarative):
         dict(
             desc='Retrieve default automember group for groups',
             command=(
-                'automember_default_group_show', [], dict(
-                    type=u'group',
-                    automemberdefaultgroup=defaultgroup1,
-                )
+                'automember_default_group_show', [], dict(type=u'group')
             ),
             expected=dict(
                 result=dict(
diff --git a/tests/test_xmlrpc/test_delegation_plugin.py b/tests/test_xmlrpc/test_delegation_plugin.py
index db5f7186527d2e0c6567dd5a727e878144bd3020..0c32b0447d113cc8e377c8fe139e11ee05e2c8ba 100644
--- a/tests/test_xmlrpc/test_delegation_plugin.py
+++ b/tests/test_xmlrpc/test_delegation_plugin.py
@@ -45,7 +45,7 @@ class test_delegation(Declarative):
 
         dict(
             desc='Try to update non-existent %r' % delegation1,
-            command=('delegation_mod', [delegation1], dict(description=u'Foo')),
+            command=('delegation_mod', [delegation1], dict(group=u'admins')),
             expected=errors.NotFound(reason='no such entry'),
         ),
 
diff --git a/tests/test_xmlrpc/test_hbac_plugin.py b/tests/test_xmlrpc/test_hbac_plugin.py
index 268c8d9d2217de71a936f691e5dc1666e9afb4b1..a75360636f9f344335cb4fd41df1c44ebe7e770a 100644
--- a/tests/test_xmlrpc/test_hbac_plugin.py
+++ b/tests/test_xmlrpc/test_hbac_plugin.py
@@ -123,7 +123,7 @@ class test_hbac(XMLRPC_test):
         Test searching for HBAC rules using `xmlrpc.hbacrule_find`.
         """
         ret = api.Command['hbacrule_find'](
-            name=self.rule_name, accessruletype=self.rule_type,
+            cn=self.rule_name, accessruletype=self.rule_type,
             description=self.rule_desc_mod
         )
         assert ret['truncated'] is False
@@ -155,7 +155,7 @@ class test_hbac(XMLRPC_test):
             self.test_sourcehostgroup, description=u'desc'
         )
         self.failsafe_add(api.Object.hbacsvc,
-            self.test_service, description=u'desc', force=True
+            self.test_service, description=u'desc',
         )
 
     def test_8_hbacrule_add_user(self):
@@ -424,7 +424,7 @@ class test_hbac(XMLRPC_test):
         """
         api.Command['hbacrule_mod'](self.rule_name, usercategory=u'all')
         try:
-            api.Command['hbacrule_add_user'](self.rule_name, users='admin')
+            api.Command['hbacrule_add_user'](self.rule_name, user='admin')
         finally:
             api.Command['hbacrule_mod'](self.rule_name, usercategory=u'')
 
diff --git a/tests/test_xmlrpc/test_hbactest_plugin.py b/tests/test_xmlrpc/test_hbactest_plugin.py
index 5d829b14c4fa6e7d96db36b64afe38a171096142..bc12e8974dc4591afa3b4a5f9e68df9ed32e2231 100644
--- a/tests/test_xmlrpc/test_hbactest_plugin.py
+++ b/tests/test_xmlrpc/test_hbactest_plugin.py
@@ -79,7 +79,7 @@ class test_hbactest(XMLRPC_test):
             self.test_sourcehostgroup, description=u'desc'
         )
         self.failsafe_add(api.Object.hbacsvc,
-            self.test_service, description=u'desc', force=True
+            self.test_service, description=u'desc'
         )
 
         for i in [0,1,2,3]:
diff --git a/tests/test_xmlrpc/test_pwpolicy.py b/tests/test_xmlrpc/test_pwpolicy.py
index c0ead9f78443ed82de2a68873e87162daa0ccbb3..6b5d64cf37d33fd576cfea12f4bff57e81f7b15c 100644
--- a/tests/test_xmlrpc/test_pwpolicy.py
+++ b/tests/test_xmlrpc/test_pwpolicy.py
@@ -49,7 +49,7 @@ class test_pwpolicy(XMLRPC_test):
         self.failsafe_add(
             api.Object.user, self.user, givenname=u'Test', sn=u'User'
         )
-        api.Command.group_add_member(self.group, users=self.user)
+        api.Command.group_add_member(self.group, user=self.user)
 
         entry = api.Command['pwpolicy_add'](self.group, **self.kw)['result']
         assert_attr_equal(entry, 'krbminpwdlife', '30')
diff --git a/tests/test_xmlrpc/test_role_plugin.py b/tests/test_xmlrpc/test_role_plugin.py
index f871e2683a993b4bd65223fb0ae1c20af977e047..9db5ea3814b6188e0b312872f470fd65ebcd8330 100644
--- a/tests/test_xmlrpc/test_role_plugin.py
+++ b/tests/test_xmlrpc/test_role_plugin.py
@@ -84,7 +84,7 @@ class test_role(Declarative):
 
         dict(
             desc='Try to rename non-existent %r' % role1,
-            command=('role_del', [role1], dict(setattr=u'cn=%s' % renamedrole1)),
+            command=('role_mod', [role1], dict(setattr=u'cn=%s' % renamedrole1)),
             expected=errors.NotFound(reason='no such entry'),
         ),
 
diff --git a/tests/test_xmlrpc/test_sudorule_plugin.py b/tests/test_xmlrpc/test_sudorule_plugin.py
index 2a597c37bea3d621941b66c2b7bec0cf8600be28..7c45256eca281c366a403e922ff6081c2581629e 100644
--- a/tests/test_xmlrpc/test_sudorule_plugin.py
+++ b/tests/test_xmlrpc/test_sudorule_plugin.py
@@ -97,7 +97,7 @@ class test_sudorule(XMLRPC_test):
         Test searching for Sudo rules using `xmlrpc.sudorule_find`.
         """
         ret = api.Command['sudorule_find'](
-            name=self.rule_name,
+            cn=self.rule_name,
             description=self.rule_desc_mod
         )
         assert ret['truncated'] is False
@@ -131,7 +131,7 @@ class test_sudorule(XMLRPC_test):
             self.test_sudodenycmdgroup, description=u'desc'
         )
         self.failsafe_add(api.Object.sudocmd,
-            self.test_command, description=u'desc', force=True
+            self.test_command, description=u'desc'
         )
 
     def test_8_sudorule_add_user(self):
@@ -592,7 +592,7 @@ class test_sudorule(XMLRPC_test):
         """
         api.Command['sudorule_mod'](self.rule_name, ipasudorunasusercategory=u'all')
         try:
-            api.Command['sudorule_add_runasuser'](self.rule_name, sudocmd=self.test_user)
+            api.Command['sudorule_add_runasuser'](self.rule_name, user=self.test_user)
         finally:
             api.Command['sudorule_mod'](self.rule_name, ipasudorunasusercategory=u'')
 
-- 
1.7.7.6

_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

Reply via email to