IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use a user result template in tests

Browse Source 
This makes the tests shorter, more descriptive, and easier to change
e.g. when new attributes are added.
This commit is contained in:
Petr Viktorin
2013-09-30 10:50:59 +02:00
parent 92cd987e0a
commit 756b997a7d
10 changed files with 272 additions and 1309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

225
ipatests/test_xmlrpc/test_attr.py
View File

@@ -21,10 +21,9 @@
Test --setattr and --addattr and other attribute-specific issues
"""
from ipalib import api, errors
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 ipalib import errors
from xmlrpc_test import Declarative
from ipatests.test_xmlrpc.test_user_plugin import get_user_result
user1=u'tuser1'
@@ -55,32 +54,7 @@ class test_attr(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],
mail=[u'%s@%s' % (user1, api.env.domain)],
displayname=[u'Test User1'],
cn=[u'Test User1'],
initials=[u'TU'],
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'],
dn=DN(('uid','tuser1'),('cn','users'),('cn','accounts'),
api.env.basedn),
has_keytab=False,
has_password=False,
)),
result=get_user_result(user1, u'Test', u'User1', 'add'),
),
),
@@ -91,19 +65,9 @@ class test_attr(Declarative):
'user_mod', [user1], dict(setattr=(u'givenname=Finkle', u'mail=test@example.com'))
),
expected=dict(
result=dict(
givenname=[u'Finkle'],
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'Finkle', u'User1', 'mod',
mail=[u'test@example.com'],
memberof_group=[u'ipausers'],
nsaccountlock=False,
has_keytab=False,
has_password=False,
),
summary=u'Modified user "tuser1"',
value=user1,
@@ -117,19 +81,9 @@ class test_attr(Declarative):
'user_mod', [user1], dict(addattr=u'mail=test2@example.com')
),
expected=dict(
result=dict(
givenname=[u'Finkle'],
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'Finkle', u'User1', 'mod',
mail=[u'test@example.com', u'test2@example.com'],
memberof_group=[u'ipausers'],
nsaccountlock=False,
has_keytab=False,
has_password=False,
),
summary=u'Modified user "tuser1"',
value=user1,
@@ -143,20 +97,10 @@ class test_attr(Declarative):
'user_mod', [user1], dict(setattr=u'telephoneNumber=410-555-1212', addattr=u'telephoneNumber=301-555-1212')
),
expected=dict(
result=dict(
givenname=[u'Finkle'],
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'Finkle', u'User1', 'mod',
mail=[u'test@example.com', u'test2@example.com'],
memberof_group=[u'ipausers'],
telephonenumber=[u'410-555-1212', u'301-555-1212'],
nsaccountlock=False,
has_keytab=False,
has_password=False,
),
summary=u'Modified user "tuser1"',
value=user1,
@@ -170,20 +114,10 @@ class test_attr(Declarative):
'user_mod', [user1], dict(setattr=u'telephoneNumber=301-555-1212')
),
expected=dict(
result=dict(
givenname=[u'Finkle'],
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'Finkle', u'User1', 'mod',
mail=[u'test@example.com', u'test2@example.com'],
memberof_group=[u'ipausers'],
telephonenumber=[u'301-555-1212'],
nsaccountlock=False,
has_keytab=False,
has_password=False,
),
summary=u'Modified user "tuser1"',
value=user1,
@@ -197,20 +131,11 @@ class test_attr(Declarative):
'user_mod', [user1], dict(addattr=(u'telephoneNumber=703-555-1212', u'telephoneNumber=202-888-9833'))
),
expected=dict(
result=dict(
givenname=[u'Finkle'],
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'Finkle', u'User1', 'mod',
mail=[u'test@example.com', u'test2@example.com'],
memberof_group=[u'ipausers'],
telephonenumber=[u'301-555-1212', u'202-888-9833', u'703-555-1212'],
nsaccountlock=False,
has_keytab=False,
has_password=False,
telephonenumber=[u'301-555-1212', u'703-555-1212',
u'202-888-9833'],
),
summary=u'Modified user "tuser1"',
value=user1,
@@ -224,20 +149,10 @@ class test_attr(Declarative):
'user_mod', [user1], dict(delattr=u'telephoneNumber=301-555-1212')
),
expected=dict(
result=dict(
givenname=[u'Finkle'],
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'Finkle', u'User1', 'mod',
mail=[u'test@example.com', u'test2@example.com'],
memberof_group=[u'ipausers'],
telephonenumber=[u'202-888-9833', u'703-555-1212'],
nsaccountlock=False,
has_keytab=False,
has_password=False,
telephonenumber=[u'703-555-1212', u'202-888-9833'],
),
summary=u'Modified user "tuser1"',
value=user1,
@@ -262,20 +177,10 @@ class test_attr(Declarative):
delattr=u'telephoneNumber=202-888-9833')
),
expected=dict(
result=dict(
givenname=[u'Finkle'],
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'Finkle', u'User1', 'mod',
mail=[u'test@example.com', u'test2@example.com'],
memberof_group=[u'ipausers'],
telephonenumber=[u'301-555-1212', u'703-555-1212'],
nsaccountlock=False,
has_keytab=False,
has_password=False,
telephonenumber=[u'703-555-1212', u'301-555-1212'],
),
summary=u'Modified user "tuser1"',
value=user1,
@@ -291,20 +196,11 @@ class test_attr(Declarative):
delattr=u'telephoneNumber=301-555-1212')
),
expected=dict(
result=dict(
givenname=[u'Finkle'],
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'Finkle', u'User1', 'mod',
mail=[u'test@example.com', u'test2@example.com'],
memberof_group=[u'ipausers'],
telephonenumber=[u'703-555-1212', u'301-555-1212', u'202-888-9833'],
nsaccountlock=False,
has_keytab=False,
has_password=False,
telephonenumber=[u'703-555-1212', u'301-555-1212',
u'202-888-9833'],
),
summary=u'Modified user "tuser1"',
value=user1,
@@ -320,20 +216,10 @@ class test_attr(Declarative):
delattr=u'telephoneNumber=301-555-1212')
),
expected=dict(
result=dict(
givenname=[u'Finkle'],
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'Finkle', u'User1', 'mod',
mail=[u'test@example.com', u'test2@example.com'],
memberof_group=[u'ipausers'],
telephonenumber=[u'202-888-9833'],
nsaccountlock=False,
has_keytab=False,
has_password=False,
),
summary=u'Modified user "tuser1"',
value=user1,
@@ -365,20 +251,10 @@ class test_attr(Declarative):
'user_mod', [user1], dict(givenname=u'Fred')
),
expected=dict(
result=dict(
givenname=[u'Fred'],
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'Fred', u'User1', 'mod',
mail=[u'test@example.com', u'test2@example.com'],
memberof_group=[u'ipausers'],
telephonenumber=[u'202-888-9833'],
nsaccountlock=False,
has_keytab=False,
has_password=False,
),
summary=u'Modified user "tuser1"',
value=user1,
@@ -392,20 +268,10 @@ class test_attr(Declarative):
'user_mod', [user1], dict(setattr=u'givenname=Finkle')
),
expected=dict(
result=dict(
givenname=[u'Finkle'],
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'Finkle', u'User1', 'mod',
mail=[u'test@example.com', u'test2@example.com'],
memberof_group=[u'ipausers'],
telephonenumber=[u'202-888-9833'],
nsaccountlock=False,
has_keytab=False,
has_password=False,
),
summary=u'Modified user "tuser1"',
value=user1,
@@ -418,20 +284,11 @@ class test_attr(Declarative):
'user_mod', [user1], dict(setattr=u'nsaccountlock=TrUe')
),
expected=dict(
result=dict(
givenname=[u'Finkle'],
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'Finkle', u'User1', 'mod',
mail=[u'test@example.com', u'test2@example.com'],
memberof_group=[u'ipausers'],
telephonenumber=[u'202-888-9833'],
nsaccountlock=True,
has_keytab=False,
has_password=False,
),
summary=u'Modified user "tuser1"',
value=user1,
@@ -446,20 +303,10 @@ class test_attr(Declarative):
delattr=u'nsaccountlock=TRUE')
),
expected=dict(
result=dict(
givenname=[u'Finkle'],
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'Finkle', u'User1', 'mod',
mail=[u'test@example.com', u'test2@example.com'],
memberof_group=[u'ipausers'],
telephonenumber=[u'202-888-9833'],
nsaccountlock=False,
has_keytab=False,
has_password=False,
),
summary=u'Modified user "tuser1"',
value=user1,

65
ipatests/test_xmlrpc/test_automember_plugin.py
View File

@@ -24,7 +24,8 @@ Test the `ipalib/plugins/automember.py` module.
from ipalib import api, errors
from ipapython.dn import DN
from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid, add_sid, add_oc
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
from ipatests.test_xmlrpc.test_user_plugin import get_user_result
user1=u'tuser1'
@@ -794,32 +795,9 @@ class test_automember(Declarative):
expected=dict(
value=manager1,
summary=u'Added user "mscott"',
result=add_sid(dict(
gecos=[u'Michael Scott'],
givenname=[u'Michael'],
homedirectory=[u'/home/mscott'],
krbprincipalname=[u'mscott@' + api.env.realm],
has_keytab=False,
has_password=False,
loginshell=[u'/bin/sh'],
objectclass=add_oc(objectclasses.user, u'ipantuserattrs'),
sn=[u'Scott'],
uid=[manager1],
uidnumber=[fuzzy_digits],
gidnumber=[fuzzy_digits],
mail=[u'%s@%s' % (manager1, api.env.domain)],
displayname=[u'Michael Scott'],
cn=[u'Michael Scott'],
initials=[u'MS'],
ipauniqueid=[fuzzy_uuid],
krbpwdpolicyreference=[DN(('cn', 'global_policy'), ('cn', api.env.realm), ('cn', 'kerberos'),
api.env.basedn)],
mepmanagedentry=[DN(('cn', manager1), ('cn', 'groups'), ('cn', 'accounts'),
api.env.basedn)],
memberof_group=[u'defaultgroup1', u'ipausers'],
dn=DN(('uid', 'mscott'), ('cn', 'users'), ('cn', 'accounts'),
api.env.basedn),
)),
result=get_user_result(
manager1, u'Michael', u'Scott', 'add',
memberof_group=[defaultgroup1, u'ipausers']),
),
),
@@ -832,33 +810,12 @@ class test_automember(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],
has_keytab=False,
has_password=False,
loginshell=[u'/bin/sh'],
objectclass=add_oc(objectclasses.user, u'ipantuserattrs'),
sn=[u'User1'],
uid=[user1],
uidnumber=[fuzzy_digits],
gidnumber=[fuzzy_digits],
mail=[u'%s@%s' % (user1, api.env.domain)],
manager=[DN(('uid', 'mscott'), ('cn', 'users'), ('cn', 'accounts'), api.env.basedn)],
displayname=[u'Test User1'],
cn=[u'Test User1'],
initials=[u'TU'],
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'group1', u'ipausers'],
dn=DN(('uid', 'tuser1'), ('cn', 'users'), ('cn', 'accounts'),
api.env.basedn),
)),
result=get_user_result(
user1, u'Test', u'User1', 'add',
memberof_group=[group1, u'ipausers'],
manager=[DN(('uid', 'mscott'), ('cn', 'users'),
('cn', 'accounts'), api.env.basedn)]
),
),
),

53
ipatests/test_xmlrpc/test_group_plugin.py
View File

@@ -26,6 +26,7 @@ from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import (Declarative, fuzzy_digits, fuzzy_uuid, fuzzy_set_ci,
add_sid, add_oc)
from ipapython.dn import DN
from ipatests.test_xmlrpc.test_user_plugin import get_user_result
group1 = u'testgroup1'
group2 = u'testgroup2'
@@ -796,31 +797,7 @@ class test_group(Declarative):
expected=dict(
value=user1,
summary=u'Added user "%s"' % user1,
result=add_sid(dict(
gecos=[u'Test User1'],
givenname=[u'Test'],
homedirectory=[u'/home/%s' % user1],
krbprincipalname=[u'%s@%s' % (user1, 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],
mail=[u'%s@%s' % (user1, api.env.domain)],
displayname=[u'Test User1'],
cn=[u'Test User1'],
initials=[u'TU'],
ipauniqueid=[fuzzy_uuid],
krbpwdpolicyreference=[DN(('cn','global_policy'),('cn',api.env.realm),
('cn','kerberos'),api.env.basedn)],
mepmanagedentry=[get_group_dn(user1)],
memberof_group=[u'ipausers'],
dn=DN(('uid',user1),('cn','users'),('cn','accounts'),
api.env.basedn),
has_keytab=False,
has_password=False,
)),
result=get_user_result(user1, u'Test', u'User1', 'add'),
),
),
@@ -912,32 +889,14 @@ class test_group(Declarative):
expected=dict(
value=user1,
summary=u'Added user "tuser1"',
result=add_sid(dict(
gecos=[u'Test User1'],
givenname=[u'Test'],
result=get_user_result(
user1, u'Test', u'User1', 'add',
description=[],
homedirectory=[u'/home/tuser1'],
krbprincipalname=[u'tuser1@' + api.env.realm],
loginshell=[u'/bin/sh'],
objectclass=add_oc(objectclasses.user_base,
u'ipantuserattrs'),
sn=[u'User1'],
uid=[user1],
uidnumber=[fuzzy_digits],
gidnumber=[u'1000'],
mail=[u'%s@%s' % (user1, api.env.domain)],
displayname=[u'Test User1'],
cn=[u'Test User1'],
initials=[u'TU'],
ipauniqueid=[fuzzy_uuid],
dn=DN(('uid','tuser1'),('cn','users'),('cn','accounts'),
api.env.basedn),
krbpwdpolicyreference=[DN(('cn','global_policy'),('cn',api.env.realm),
('cn','kerberos'),api.env.basedn)],
memberof_group=[u'ipausers'],
has_keytab=False,
has_password=False,
)),
omit=['mepmanagedentry'],
),
),
),

30
ipatests/test_xmlrpc/test_krbtpolicy.py
View File

@@ -21,9 +21,9 @@ Test kerberos ticket policy
"""
from ipalib import api, errors
from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid, add_sid, add_oc
from xmlrpc_test import Declarative
from ipapython.dn import DN
from ipatests.test_xmlrpc.test_user_plugin import get_user_result
user1 = u'tuser1'
@@ -94,31 +94,7 @@ class test_krbtpolicy(Declarative):
expected=dict(
value=user1,
summary=u'Added user "%s"' % user1,
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],
mail=[u'%s@%s' % (user1, api.env.domain)],
displayname=[u'Test User1'],
cn=[u'Test User1'],
initials=[u'TU'],
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',user1),('cn','users'),('cn','accounts'), api.env.basedn)
)),
result=get_user_result(user1, u'Test', u'User1', 'add'),
),
),

111
ipatests/test_xmlrpc/test_nesting.py
View File

@@ -22,8 +22,9 @@ Test group nesting and indirect members
from ipalib import api
from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid, add_sid, add_oc
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
from ipapython.dn import DN
from ipatests.test_xmlrpc.test_user_plugin import get_user_result
group1 = u'testgroup1'
group2 = u'testgroup2'
@@ -160,32 +161,7 @@ class test_nesting(Declarative):
expected=dict(
value=user1,
summary=u'Added user "%s"' % user1,
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],
mail=[u'%s@%s' % (user1, api.env.domain)],
displayname=[u'Test User1'],
cn=[u'Test User1'],
initials=[u'TU'],
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',user1),('cn','users'),('cn','accounts'),
api.env.basedn)
)),
result=get_user_result(user1, u'Test', u'User1', 'add'),
),
),
@@ -198,32 +174,7 @@ class test_nesting(Declarative):
expected=dict(
value=user2,
summary=u'Added user "%s"' % user2,
result=add_sid(dict(
gecos=[u'Test User2'],
givenname=[u'Test'],
homedirectory=[u'/home/tuser2'],
krbprincipalname=[u'tuser2@' + api.env.realm],
loginshell=[u'/bin/sh'],
objectclass=add_oc(objectclasses.user, u'ipantuserattrs'),
sn=[u'User2'],
uid=[user2],
uidnumber=[fuzzy_digits],
gidnumber=[fuzzy_digits],
mail=[u'%s@%s' % (user2, api.env.domain)],
displayname=[u'Test User2'],
cn=[u'Test User2'],
initials=[u'TU'],
ipauniqueid=[fuzzy_uuid],
krbpwdpolicyreference=[DN(('cn','global_policy'),('cn',api.env.realm),
('cn','kerberos'),api.env.basedn)],
mepmanagedentry=[DN(('cn',user2),('cn','groups'),('cn','accounts'),
api.env.basedn)],
memberof_group=[u'ipausers'],
has_keytab=False,
has_password=False,
dn=DN(('uid',user2),('cn','users'),('cn','accounts'),
api.env.basedn)
)),
result=get_user_result(user2, u'Test', u'User2', 'add'),
),
),
@@ -236,32 +187,7 @@ class test_nesting(Declarative):
expected=dict(
value=user3,
summary=u'Added user "%s"' % user3,
result=add_sid(dict(
gecos=[u'Test User3'],
givenname=[u'Test'],
homedirectory=[u'/home/tuser3'],
krbprincipalname=[u'tuser3@' + api.env.realm],
loginshell=[u'/bin/sh'],
objectclass=add_oc(objectclasses.user, u'ipantuserattrs'),
sn=[u'User3'],
uid=[user3],
uidnumber=[fuzzy_digits],
gidnumber=[fuzzy_digits],
mail=[u'%s@%s' % (user3, api.env.domain)],
displayname=[u'Test User3'],
cn=[u'Test User3'],
initials=[u'TU'],
ipauniqueid=[fuzzy_uuid],
krbpwdpolicyreference=[DN(('cn','global_policy'),('cn',api.env.realm),
('cn','kerberos'),api.env.basedn)],
mepmanagedentry=[DN(('cn',user3),('cn','groups'),('cn','accounts'),
api.env.basedn)],
memberof_group=[u'ipausers'],
has_keytab=False,
has_password=False,
dn=DN(('uid',user3),('cn','users'),('cn','accounts'),
api.env.basedn)
)),
result=get_user_result(user3, u'Test', u'User3', 'add'),
),
),
@@ -274,32 +200,7 @@ class test_nesting(Declarative):
expected=dict(
value=user4,
summary=u'Added user "%s"' % user4,
result=add_sid(dict(
gecos=[u'Test User4'],
givenname=[u'Test'],
homedirectory=[u'/home/tuser4'],
krbprincipalname=[u'tuser4@' + api.env.realm],
loginshell=[u'/bin/sh'],
objectclass=add_oc(objectclasses.user, u'ipantuserattrs'),
sn=[u'User4'],
uid=[user4],
uidnumber=[fuzzy_digits],
gidnumber=[fuzzy_digits],
mail=[u'%s@%s' % (user4, api.env.domain)],
displayname=[u'Test User4'],
cn=[u'Test User4'],
initials=[u'TU'],
ipauniqueid=[fuzzy_uuid],
krbpwdpolicyreference=[DN(('cn','global_policy'),('cn',api.env.realm),
('cn','kerberos'),api.env.basedn)],
mepmanagedentry=[DN(('cn',user4),('cn','groups'),('cn','accounts'),
api.env.basedn)],
memberof_group=[u'ipausers'],
has_keytab=False,
has_password=False,
dn=DN(('uid',user4),('cn','users'),('cn','accounts'),
api.env.basedn)
)),
result=get_user_result(user4, u'Test', u'User4', 'add'),
),
),

58
ipatests/test_xmlrpc/test_netgroup_plugin.py
View File

@@ -23,13 +23,15 @@ Test the `ipalib/plugins/netgroup.py` module.
import nose
import krbV
from ipalib import api
from ipalib import errors
from ipaserver.plugins.ldap2 import ldap2
from xmlrpc_test import (Declarative, fuzzy_digits, fuzzy_uuid,
fuzzy_netgroupdn, add_sid, add_oc)
fuzzy_netgroupdn)
from ipatests.test_xmlrpc import objectclasses
from ipapython.dn import DN
from ipatests.test_xmlrpc.test_user_plugin import get_user_result
# Global so we can save the value between tests
netgroup_dn = None
@@ -272,32 +274,7 @@ class test_netgroup(Declarative):
expected=dict(
value=user1,
summary=u'Added user "%s"' % user1,
result=add_sid(dict(
gecos=[u'Test User1'],
givenname=[u'Test'],
homedirectory=[u'/home/%s' % user1],
krbprincipalname=[u'%s@%s' % (user1, 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],
mail=[u'%s@%s' % (user1, api.env.domain)],
displayname=[u'Test User1'],
cn=[u'Test User1'],
initials=[u'TU'],
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',user1),('cn','users'),('cn','accounts'),
api.env.basedn),
)),
result=get_user_result(user1, u'Test', u'User1', 'add'),
),
),
@@ -309,32 +286,7 @@ class test_netgroup(Declarative):
expected=dict(
value=user2,
summary=u'Added user "%s"' % user2,
result=add_sid(dict(
gecos=[u'Test User2'],
givenname=[u'Test'],
homedirectory=[u'/home/%s' % user2],
krbprincipalname=[u'%s@%s' % (user2, api.env.realm)],
loginshell=[u'/bin/sh'],
objectclass=add_oc(objectclasses.user, u'ipantuserattrs'),
sn=[u'User2'],
uid=[user2],
uidnumber=[fuzzy_digits],
gidnumber=[fuzzy_digits],
mail=[u'%s@%s' % (user2, api.env.domain)],
displayname=[u'Test User2'],
cn=[u'Test User2'],
initials=[u'TU'],
ipauniqueid=[fuzzy_uuid],
krbpwdpolicyreference=[DN(('cn','global_policy'),('cn',api.env.realm),
('cn','kerberos'),api.env.basedn)],
mepmanagedentry=[DN(('cn',user2),('cn','groups'),('cn','accounts'),
api.env.basedn)],
memberof_group=[u'ipausers'],
has_keytab=False,
has_password=False,
dn=DN(('uid',user2),('cn','users'),('cn','accounts'),
api.env.basedn),
)),
result=get_user_result(user2, u'Test', u'User2', 'add'),
),
),

25
ipatests/test_xmlrpc/test_range_plugin.py
View File

@@ -26,6 +26,7 @@ from xmlrpc_test import Declarative, fuzzy_uuid
from ipatests.test_xmlrpc import objectclasses
from ipatests.util import MockLDAP
from ipapython.dn import DN
from ipatests.test_xmlrpc.test_user_plugin import get_user_result
id_shift = 0
rid_shift = 0
@@ -232,30 +233,10 @@ class test_range(Declarative):
expected=dict(
value=user1,
summary=u'Added user "%s"' % user1,
result=dict(
gecos=[u'Test User1'],
givenname=[u'Test'],
homedirectory=[u'/home/tuser1'],
krbprincipalname=[u'tuser1@' + api.env.realm],
loginshell=[u'/bin/sh'],
objectclass=objectclasses.user,
sn=[u'User1'],
uid=[user1],
result=get_user_result(
user1, u'Test', u'User1', 'add',
uidnumber=[unicode(user1_uid)],
gidnumber=[unicode(user1_uid)],
displayname=[u'Test User1'],
cn=[u'Test User1'],
initials=[u'TU'],
mail=[u'%s@%s' % (user1, api.env.domain)],
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',user1),('cn','users'),('cn','accounts'), api.env.basedn)
),
),
),

124
ipatests/test_xmlrpc/test_replace.py
View File

@@ -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,

33
ipatests/test_xmlrpc/test_selinuxusermap_plugin.py
View File

@@ -22,9 +22,10 @@ Test the `ipalib/plugins/selinuxusermap.py` module.
from ipalib import api, errors
from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid, add_sid, add_oc
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
from ipapython.dn import DN
from ipatests.util import Fuzzy
from ipatests.test_xmlrpc.test_user_plugin import get_user_result
rule1 = u'selinuxrule1'
selinuxuser1 = u'guest_u:s0'
@@ -200,35 +201,7 @@ class test_selinuxusermap(Declarative):
expected=dict(
value=user1,
summary=u'Added user "%s"' % user1,
result=add_sid(dict(
gecos=[u'Test User1'],
givenname=[u'Test'],
homedirectory=[u'/home/%s' % user1],
krbprincipalname=[u'%s@%s' % (user1, 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],
mail=[u'%s@%s' % (user1, api.env.domain)],
displayname=[u'Test User1'],
cn=[u'Test User1'],
initials=[u'TU'],
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'],
dn=DN(('uid', user1), ('cn', 'users'), ('cn', 'accounts'),
api.env.basedn),
has_keytab=False,
has_password=False,
)),
result=get_user_result(user1, u'Test', u'User1', 'add'),
),
),

857
ipatests/test_xmlrpc/test_user_plugin.py
View File

File diff suppressed because it is too large Load Diff