From d3b0c64fcec9a97626dbaca238a0186f180fe2fd Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten@redhat.com>
Date: Fri, 22 Apr 2011 13:43:30 -0400
Subject: Modify the default attributes shown in user-find to match the UI
 design.

This change means the UI can stop using the --all option and have to
retrieve significantly less information from the server. It also
speeds up user-find as it doesn't have to calculate membership.

This adds a new baseclass parameter, search_display_attributes, which
can provide a separate list from default_attributes just for find
commands.

The UI will need to be changed to switch from using cn to using
givenname and sn.

ticket 1136
---
 tests/test_xmlrpc/test_user_plugin.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'tests/test_xmlrpc')

diff --git a/tests/test_xmlrpc/test_user_plugin.py b/tests/test_xmlrpc/test_user_plugin.py
index 4d997021..597b3b9b 100644
--- a/tests/test_xmlrpc/test_user_plugin.py
+++ b/tests/test_xmlrpc/test_user_plugin.py
@@ -184,8 +184,9 @@ class test_user(Declarative):
                         loginshell=[u'/bin/sh'],
                         sn=[u'User1'],
                         uid=[user1],
-                        memberof_group=[u'ipausers'],
                         nsaccountlock=[u'False'],
+                        uidnumber=[fuzzy_digits],
+                        gidnumber=[fuzzy_digits],
                     ),
                 ],
                 summary=u'1 user matched',
@@ -208,8 +209,9 @@ class test_user(Declarative):
                         loginshell=[u'/bin/bash'],
                         sn=[u'Administrator'],
                         uid=[u'admin'],
-                        memberof_group=[u'admins'],
                         nsaccountlock=[u'False'],
+                        uidnumber=[fuzzy_digits],
+                        gidnumber=[fuzzy_digits],
                     ),
                     dict(
                         dn=u'uid=tuser1,cn=users,cn=accounts,' + api.env.basedn,
@@ -218,8 +220,9 @@ class test_user(Declarative):
                         loginshell=[u'/bin/sh'],
                         sn=[u'User1'],
                         uid=[user1],
-                        memberof_group=[u'ipausers'],
                         nsaccountlock=[u'False'],
+                        uidnumber=[fuzzy_digits],
+                        gidnumber=[fuzzy_digits],
                     ),
                 ],
                 summary=u'2 users matched',
@@ -242,8 +245,9 @@ class test_user(Declarative):
                         loginshell=[u'/bin/bash'],
                         sn=[u'Administrator'],
                         uid=[u'admin'],
-                        memberof_group=[u'admins'],
                         nsaccountlock=[u'False'],
+                        uidnumber=[fuzzy_digits],
+                        gidnumber=[fuzzy_digits],
                     ),
                 ],
                 summary=u'1 user matched',
@@ -459,7 +463,7 @@ class test_user(Declarative):
                     uid=[user2],
                     memberof_group=[u'ipausers'],
                     nsaccountlock=[u'False'],
-                    manager=user1,
+                    manager=[user1],
                 ),
                 summary=u'Modified user "%s"' % user2,
                 value=user2,
-- 
cgit