Re: [Freeipa-devel] [PATCH] 238 Fix modlist generation code not to generate empty replace mods

[Petr Viktorin]

On 02/04/2014 03:01 PM, Jan Cholasta wrote:

Hi,

the attached patch fixes <https://fedorahosted.org/freeipa/ticket/4138>.

Honza

Thanks, ACK. Here are some tests for this, do they look good?


--
Petr³


From ca10b6af63727f0ca7a008dccc9edbe594ca5467 Mon Sep 17 00:00:00 2001
From: Petr Viktorin <pvikt...@redhat.com>
Date: Fri, 28 Feb 2014 16:27:22 +0100
Subject: [PATCH] Test fixed modlist generation code

https://fedorahosted.org/freeipa/ticket/4138
---
 ipatests/test_xmlrpc/test_attr.py              |  6 ++++++
 ipatests/test_xmlrpc/test_permission_plugin.py | 12 +++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/ipatests/test_xmlrpc/test_attr.py b/ipatests/test_xmlrpc/test_attr.py
index d4671b9848baa90021dd77ae71009ea454798ec8..70e3d326c5e8085afe83a3b3742273266869aa46 100644
--- a/ipatests/test_xmlrpc/test_attr.py
+++ b/ipatests/test_xmlrpc/test_attr.py
@@ -279,6 +279,12 @@ class test_attr(Declarative):
         ),
 
         dict(
+            desc='Try to "remove" empty location from %r' % user1,
+            command=('user_mod', [user1], dict(l=None)),
+            expected=errors.EmptyModlist(),
+        ),
+
+        dict(
             desc='Lock %r using setattr' % user1,
             command=(
                 'user_mod', [user1], dict(setattr=u'nsaccountlock=TrUe')
diff --git a/ipatests/test_xmlrpc/test_permission_plugin.py b/ipatests/test_xmlrpc/test_permission_plugin.py
index 4903bfae340dd8955a170bbb2c8121468bc47a18..6aa00f9f7de03486fb9304bb09ca7eee68142e52 100644
--- a/ipatests/test_xmlrpc/test_permission_plugin.py
+++ b/ipatests/test_xmlrpc/test_permission_plugin.py
@@ -271,6 +271,16 @@ class test_permission_negative(Declarative):
         ),
 
         dict(
+            desc='Try to "remove" empty memberof from %r' % permission1,
+            command=(
+                'permission_mod', [permission1], dict(
+                    memberof=None,
+                )
+            ),
+            expected=errors.EmptyModlist(),
+        ),
+
+        dict(
             desc='Try to remove targetfilter and memberof from %r' % permission1,
             command=(
                 'permission_mod', [permission1], dict(
@@ -285,7 +295,7 @@ class test_permission_negative(Declarative):
         ),
 
         dict(
-            desc='Try to rename %r to invalid invalid %r' % (
+            desc='Try to rename %r to invalid %r' % (
                 permission1, invalid_permission1),
             command=('permission_mod', [permission1], dict(
                     rename=invalid_permission1,
-- 
1.8.5.3


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