From ffd467bd7e12faad3f1574fe3c1e505820bdf459 Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten@redhat.com>
Date: Mon, 20 Dec 2010 13:53:35 -0500
Subject: Translate the membergroup dn into a group name.

Drop filter from the output, it is superfluous.

ticket 634
---
 tests/test_xmlrpc/test_delegation_plugin.py | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'tests/test_xmlrpc')

diff --git a/tests/test_xmlrpc/test_delegation_plugin.py b/tests/test_xmlrpc/test_delegation_plugin.py
index a4520f43..b2b24d98 100644
--- a/tests/test_xmlrpc/test_delegation_plugin.py
+++ b/tests/test_xmlrpc/test_delegation_plugin.py
@@ -26,7 +26,7 @@ from tests.test_xmlrpc import objectclasses
 from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
 
 delegation1 = u'testdelegation'
-memberdn1 = u'cn=admins,cn=groups,cn=accounts,%s' % api.env.basedn
+member1 = u'admins'
 
 class test_delegation(Declarative):
 
@@ -89,8 +89,7 @@ class test_delegation(Declarative):
                     permissions=[u'write'],
                     aciname=delegation1,
                     group=u'editors',
-                    membergroup=u'%s' % memberdn1,
-                    filter = u'(memberOf=%s)' % memberdn1
+                    membergroup=[member1],
                 ),
             ),
         ),
@@ -121,8 +120,7 @@ class test_delegation(Declarative):
                     'permissions': [u'write'],
                     'aciname': delegation1,
                     'group': u'editors',
-                    'filter': u'(memberOf=%s)' % memberdn1,
-                    'membergroup': u'%s' % memberdn1
+                    'membergroup': [member1],
                 },
             ),
         ),
@@ -141,8 +139,7 @@ class test_delegation(Declarative):
                     'permissions': [u'write'],
                     'aciname': delegation1,
                     'group': u'editors',
-                    'membergroup': u'%s' % memberdn1,
-                    'filter': u'(memberOf=%s)' % memberdn1
+                    'membergroup': [member1],
                     },
                 ],
             ),
@@ -162,8 +159,7 @@ class test_delegation(Declarative):
                     permissions=[u'read'],
                     aciname=delegation1,
                     group=u'editors',
-                    membergroup=u'%s' % memberdn1,
-                    filter=u'(memberOf=%s)' % memberdn1
+                    membergroup=[member1],
                 ),
             ),
         ),
@@ -180,8 +176,7 @@ class test_delegation(Declarative):
                     'permissions': [u'read'],
                     'aciname': delegation1,
                     'group': u'editors',
-                    'membergroup': u'%s' % memberdn1,
-                    'filter': u'(memberOf=%s)' % memberdn1
+                    'membergroup': [member1],
                 },
             ),
         ),
-- 
cgit