Use a user result template in tests

This makes the tests shorter, more descriptive, and easier to change
e.g. when new attributes are added.

1 files changed, 22 insertions, 102 deletions

diff --git a/ipatests/test_xmlrpc/test_replace.py b/ipatests/test_xmlrpc/test_replace.py
index 1b946b76c..0d02a0d8b 100644
--- a/ipatests/test_xmlrpc/test_replace.py
+++ b/ipatests/test_xmlrpc/test_replace.py
@@ -25,10 +25,8 @@ Note that member management in other tests also exercises the
 gen_modlist code.
 """
 
-from ipalib import api
-from ipatests.test_xmlrpc import objectclasses
-from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid, add_sid, add_oc
-from ipapython.dn import DN
+from xmlrpc_test import Declarative
+from ipatests.test_xmlrpc.test_user_plugin import get_user_result
 
 user1=u'tuser1'
 
@@ -50,32 +48,10 @@ class test_replace(Declarative):
             expected=dict(
                 value=user1,
                 summary=u'Added user "tuser1"',
-                result=add_sid(dict(
-                    gecos=[u'Test User1'],
-                    givenname=[u'Test'],
-                    homedirectory=[u'/home/tuser1'],
-                    krbprincipalname=[u'tuser1@' + api.env.realm],
-                    loginshell=[u'/bin/sh'],
-                    objectclass=add_oc(objectclasses.user, u'ipantuserattrs'),
-                    sn=[u'User1'],
-                    uid=[user1],
-                    uidnumber=[fuzzy_digits],
-                    gidnumber=[fuzzy_digits],
-                    displayname=[u'Test User1'],
-                    cn=[u'Test User1'],
-                    initials=[u'TU'],
+                result=get_user_result(
+                    user1, u'Test', u'User1', 'add',
                     mail=[u'test1@example.com', u'test2@example.com'],
-                    ipauniqueid=[fuzzy_uuid],
-                    krbpwdpolicyreference=[DN(('cn','global_policy'),('cn',api.env.realm),('cn','kerberos'),
-                                              api.env.basedn)],
-                    mepmanagedentry=[DN(('cn',user1),('cn','groups'),('cn','accounts'),
-                                        api.env.basedn)],
-                    memberof_group=[u'ipausers'],
-                    has_keytab=False,
-                    has_password=False,
-                    dn=DN(('uid','tuser1'),('cn','users'),('cn','accounts'),
-                          api.env.basedn),
-                )),
+                ),
             ),
         ),
 
@@ -86,19 +62,9 @@ class test_replace(Declarative):
                 'user_mod', [user1], dict(mail=[u'test1@example.com', u'test3@example.com'])
             ),
             expected=dict(
-                result=dict(
-                    givenname=[u'Test'],
-                    homedirectory=[u'/home/tuser1'],
-                    loginshell=[u'/bin/sh'],
-                    sn=[u'User1'],
-                    uid=[user1],
-                    uidnumber=[fuzzy_digits],
-                    gidnumber=[fuzzy_digits],
+                result=get_user_result(
+                    user1, u'Test', u'User1', 'mod',
                     mail=[u'test1@example.com', u'test3@example.com'],
-                    memberof_group=[u'ipausers'],
-                    nsaccountlock=False,
-                    has_keytab=False,
-                    has_password=False,
                 ),
                 summary=u'Modified user "tuser1"',
                 value=user1,
@@ -112,19 +78,9 @@ class test_replace(Declarative):
                 'user_mod', [user1], dict(mail=u'test4@example.com')
             ),
             expected=dict(
-                result=dict(
-                    givenname=[u'Test'],
-                    homedirectory=[u'/home/tuser1'],
-                    loginshell=[u'/bin/sh'],
-                    sn=[u'User1'],
-                    uid=[user1],
-                    uidnumber=[fuzzy_digits],
-                    gidnumber=[fuzzy_digits],
+                result=get_user_result(
+                    user1, u'Test', u'User1', 'mod',
                     mail=[u'test4@example.com'],
-                    memberof_group=[u'ipausers'],
-                    nsaccountlock=False,
-                    has_keytab=False,
-                    has_password=False,
                 ),
                 summary=u'Modified user "tuser1"',
                 value=user1,
@@ -138,19 +94,10 @@ class test_replace(Declarative):
                 'user_mod', [user1], dict(mail=[u'test5@example.com', u'test6@example.com', u'test7@example.com'])
             ),
             expected=dict(
-                result=dict(
-                    givenname=[u'Test'],
-                    homedirectory=[u'/home/tuser1'],
-                    loginshell=[u'/bin/sh'],
-                    sn=[u'User1'],
-                    uid=[user1],
-                    uidnumber=[fuzzy_digits],
-                    gidnumber=[fuzzy_digits],
-                    mail=[u'test6@example.com', u'test7@example.com', u'test5@example.com'],
-                    memberof_group=[u'ipausers'],
-                    nsaccountlock=False,
-                    has_keytab=False,
-                    has_password=False,
+                result=get_user_result(
+                    user1, u'Test', u'User1', 'mod',
+                    mail=[u'test5@example.com', u'test6@example.com',
+                          u'test7@example.com'],
                 ),
                 summary=u'Modified user "tuser1"',
                 value=user1,
@@ -164,18 +111,9 @@ class test_replace(Declarative):
                 'user_mod', [user1], dict(mail=u'')
             ),
             expected=dict(
-                result=dict(
-                    givenname=[u'Test'],
-                    homedirectory=[u'/home/tuser1'],
-                    loginshell=[u'/bin/sh'],
-                    sn=[u'User1'],
-                    uid=[user1],
-                    uidnumber=[fuzzy_digits],
-                    gidnumber=[fuzzy_digits],
-                    memberof_group=[u'ipausers'],
-                    nsaccountlock=False,
-                    has_keytab=False,
-                    has_password=False,
+                result=get_user_result(
+                    user1, u'Test', u'User1', 'mod',
+                    omit=['mail'],
                 ),
                 summary=u'Modified user "tuser1"',
                 value=user1,
@@ -189,19 +127,10 @@ class test_replace(Declarative):
                 'user_mod', [user1], dict(initials=u'ABC')
             ),
             expected=dict(
-                result=dict(
-                    givenname=[u'Test'],
-                    homedirectory=[u'/home/tuser1'],
-                    loginshell=[u'/bin/sh'],
-                    sn=[u'User1'],
-                    uid=[user1],
-                    uidnumber=[fuzzy_digits],
-                    gidnumber=[fuzzy_digits],
+                result=get_user_result(
+                    user1, u'Test', u'User1', 'mod',
                     initials=[u'ABC'],
-                    memberof_group=[u'ipausers'],
-                    nsaccountlock=False,
-                    has_keytab=False,
-                    has_password=False,
+                    omit=['mail'],
                 ),
                 summary=u'Modified user "tuser1"',
                 value=user1,
@@ -215,18 +144,9 @@ class test_replace(Declarative):
                 'user_mod', [user1], dict(initials=u'')
             ),
             expected=dict(
-                result=dict(
-                    givenname=[u'Test'],
-                    homedirectory=[u'/home/tuser1'],
-                    loginshell=[u'/bin/sh'],
-                    sn=[u'User1'],
-                    uid=[user1],
-                    uidnumber=[fuzzy_digits],
-                    gidnumber=[fuzzy_digits],
-                    memberof_group=[u'ipausers'],
-                    nsaccountlock=False,
-                    has_keytab=False,
-                    has_password=False,
+                result=get_user_result(
+                    user1, u'Test', u'User1', 'mod',
+                    omit=['mail'],
                 ),
                 summary=u'Modified user "tuser1"',
                 value=user1,