summaryrefslogtreecommitdiffstats
path: root/tests/test_xmlrpc/test_nesting.py
diff options
context:
space:
mode:
Diffstat (limited to 'tests/test_xmlrpc/test_nesting.py')
-rw-r--r--tests/test_xmlrpc/test_nesting.py166
1 files changed, 68 insertions, 98 deletions
diff --git a/tests/test_xmlrpc/test_nesting.py b/tests/test_xmlrpc/test_nesting.py
index a855960a1..c28b7096b 100644
--- a/tests/test_xmlrpc/test_nesting.py
+++ b/tests/test_xmlrpc/test_nesting.py
@@ -23,7 +23,7 @@ Test group nexting an indirect members
from ipalib import api, errors
from tests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
-from ipalib.dn import *
+from ipapython.dn import DN
group1 = u'testgroup1'
group2 = u'testgroup2'
@@ -80,9 +80,8 @@ class test_nesting(Declarative):
objectclass=objectclasses.group + [u'posixgroup'],
ipauniqueid=[fuzzy_uuid],
gidnumber=[fuzzy_digits],
- dn=lambda x: DN(x) == \
- DN(('cn','testgroup1'),('cn','groups'),
- ('cn','accounts'),api.env.basedn),
+ dn=DN(('cn','testgroup1'),('cn','groups'),
+ ('cn','accounts'),api.env.basedn),
),
),
),
@@ -104,9 +103,8 @@ class test_nesting(Declarative):
gidnumber=[fuzzy_digits],
objectclass=objectclasses.group + [u'posixgroup'],
ipauniqueid=[fuzzy_uuid],
- dn=lambda x: DN(x) == \
- DN(('cn','testgroup2'),('cn','groups'),
- ('cn','accounts'),api.env.basedn),
+ dn=DN(('cn','testgroup2'),('cn','groups'),
+ ('cn','accounts'),api.env.basedn),
),
),
),
@@ -126,9 +124,8 @@ class test_nesting(Declarative):
gidnumber=[fuzzy_digits],
objectclass=objectclasses.group + [u'posixgroup'],
ipauniqueid=[fuzzy_uuid],
- dn=lambda x: DN(x) == \
- DN(('cn','testgroup3'),('cn','groups'),
- ('cn','accounts'),api.env.basedn),
+ dn=DN(('cn','testgroup3'),('cn','groups'),
+ ('cn','accounts'),api.env.basedn),
),
),
),
@@ -148,9 +145,8 @@ class test_nesting(Declarative):
gidnumber=[fuzzy_digits],
objectclass=objectclasses.group + [u'posixgroup'],
ipauniqueid=[fuzzy_uuid],
- dn=lambda x: DN(x) == \
- DN(('cn','testgroup4'),('cn','groups'),
- ('cn','accounts'),api.env.basedn),
+ dn=DN(('cn','testgroup4'),('cn','groups'),
+ ('cn','accounts'),api.env.basedn),
),
),
),
@@ -179,18 +175,15 @@ class test_nesting(Declarative):
cn=[u'Test User1'],
initials=[u'TU'],
ipauniqueid=[fuzzy_uuid],
- krbpwdpolicyreference=lambda x: [DN(i) for i in x] == \
- [DN(('cn','global_policy'),('cn',api.env.realm),
- ('cn','kerberos'),api.env.basedn)],
- mepmanagedentry=lambda x: [DN(i) for i in x] == \
- [DN(('cn',user1),('cn','groups'),('cn','accounts'),
- api.env.basedn)],
+ 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=lambda x: DN(x) == \
- DN(('uid',user1),('cn','users'),('cn','accounts'),
- api.env.basedn)
+ dn=DN(('uid',user1),('cn','users'),('cn','accounts'),
+ api.env.basedn)
),
),
),
@@ -219,18 +212,15 @@ class test_nesting(Declarative):
cn=[u'Test User2'],
initials=[u'TU'],
ipauniqueid=[fuzzy_uuid],
- krbpwdpolicyreference=lambda x: [DN(i) for i in x] == \
- [DN(('cn','global_policy'),('cn',api.env.realm),
- ('cn','kerberos'),api.env.basedn)],
- mepmanagedentry=lambda x: [DN(i) for i in x] == \
- [DN(('cn',user2),('cn','groups'),('cn','accounts'),
- api.env.basedn)],
+ 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=lambda x: DN(x) == \
- DN(('uid',user2),('cn','users'),('cn','accounts'),
- api.env.basedn)
+ dn=DN(('uid',user2),('cn','users'),('cn','accounts'),
+ api.env.basedn)
),
),
),
@@ -259,18 +249,15 @@ class test_nesting(Declarative):
cn=[u'Test User3'],
initials=[u'TU'],
ipauniqueid=[fuzzy_uuid],
- krbpwdpolicyreference=lambda x: [DN(i) for i in x] == \
- [DN(('cn','global_policy'),('cn',api.env.realm),
- ('cn','kerberos'),api.env.basedn)],
- mepmanagedentry=lambda x: [DN(i) for i in x] == \
- [DN(('cn',user3),('cn','groups'),('cn','accounts'),
- api.env.basedn)],
+ 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=lambda x: DN(x) == \
- DN(('uid',user3),('cn','users'),('cn','accounts'),
- api.env.basedn)
+ dn=DN(('uid',user3),('cn','users'),('cn','accounts'),
+ api.env.basedn)
),
),
),
@@ -299,18 +286,15 @@ class test_nesting(Declarative):
cn=[u'Test User4'],
initials=[u'TU'],
ipauniqueid=[fuzzy_uuid],
- krbpwdpolicyreference=lambda x: [DN(i) for i in x] == \
- [DN(('cn','global_policy'),('cn',api.env.realm),
- ('cn','kerberos'),api.env.basedn)],
- mepmanagedentry=lambda x: [DN(i) for i in x] == \
- [DN(('cn',user4),('cn','groups'),('cn','accounts'),
- api.env.basedn)],
+ 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=lambda x: DN(x) == \
- DN(('uid',user4),('cn','users'),('cn','accounts'),
- api.env.basedn)
+ dn=DN(('uid',user4),('cn','users'),('cn','accounts'),
+ api.env.basedn)
),
),
),
@@ -375,9 +359,8 @@ class test_nesting(Declarative):
),
),
result={
- 'dn': lambda x: DN(x) == \
- DN(('cn',group1),('cn','groups'),('cn','accounts'),
- api.env.basedn),
+ 'dn': DN(('cn',group1),('cn','groups'),('cn','accounts'),
+ api.env.basedn),
'member_group': (group2,),
'gidnumber': [fuzzy_digits],
'cn': [group1],
@@ -401,9 +384,8 @@ class test_nesting(Declarative):
),
),
result={
- 'dn': lambda x: DN(x) == \
- DN(('cn',group1),('cn','groups'),('cn','accounts'),
- api.env.basedn),
+ 'dn': DN(('cn',group1),('cn','groups'),('cn','accounts'),
+ api.env.basedn),
'member_group': [group2, group3,],
'gidnumber': [fuzzy_digits],
'cn': [group1],
@@ -427,9 +409,8 @@ class test_nesting(Declarative):
),
),
result={
- 'dn': lambda x: DN(x) == \
- DN(('cn',group2),('cn','groups'),('cn','accounts'),
- api.env.basedn),
+ 'dn': DN(('cn',group2),('cn','groups'),('cn','accounts'),
+ api.env.basedn),
'member_user': (u'tuser1',),
'memberof_group': (u'testgroup1',),
'gidnumber': [fuzzy_digits],
@@ -454,9 +435,8 @@ class test_nesting(Declarative):
),
),
result={
- 'dn': lambda x: DN(x) == \
- DN(('cn',group2),('cn','groups'),('cn','accounts'),
- api.env.basedn),
+ 'dn': DN(('cn',group2),('cn','groups'),('cn','accounts'),
+ api.env.basedn),
'member_user': [user1, user2],
'memberof_group': [group1],
'gidnumber': [fuzzy_digits],
@@ -481,9 +461,8 @@ class test_nesting(Declarative):
),
),
result={
- 'dn': lambda x: DN(x) == \
- DN(('cn',group3),('cn','groups'),('cn','accounts'),
- api.env.basedn),
+ 'dn': DN(('cn',group3),('cn','groups'),('cn','accounts'),
+ api.env.basedn),
'member_user': [user3],
'memberof_group': [group1],
'gidnumber': [fuzzy_digits],
@@ -508,9 +487,8 @@ class test_nesting(Declarative):
),
),
result={
- 'dn': lambda x: DN(x) == \
- DN(('cn',group3),('cn','groups'),('cn','accounts'),
- api.env.basedn),
+ 'dn': DN(('cn',group3),('cn','groups'),('cn','accounts'),
+ api.env.basedn),
'member_user': [user3],
'memberof_group': [group1],
'member_group': [group4],
@@ -536,9 +514,8 @@ class test_nesting(Declarative):
),
),
result={
- 'dn': lambda x: DN(x) == \
- DN(('cn',group4),('cn','groups'),('cn','accounts'),
- api.env.basedn),
+ 'dn': DN(('cn',group4),('cn','groups'),('cn','accounts'),
+ api.env.basedn),
'member_user': [user1],
'memberof_group': [group3],
'memberofindirect_group': [group1],
@@ -564,9 +541,8 @@ class test_nesting(Declarative):
),
),
result={
- 'dn': lambda x: DN(x) == \
- DN(('cn',group4),('cn','groups'),('cn','accounts'),
- api.env.basedn),
+ 'dn': DN(('cn',group4),('cn','groups'),('cn','accounts'),
+ api.env.basedn),
'member_user': [user1, user4],
'memberof_group': [group3],
'memberofindirect_group': [group1],
@@ -591,9 +567,8 @@ class test_nesting(Declarative):
memberindirect_group = [group4],
member_group = [group2, group3],
memberindirect_user = [user1, user2, user3, user4],
- dn=lambda x: DN(x) == \
- DN(('cn','testgroup1'),('cn','groups'),
- ('cn','accounts'),api.env.basedn),
+ dn=DN(('cn','testgroup1'),('cn','groups'),
+ ('cn','accounts'),api.env.basedn),
),
),
),
@@ -611,9 +586,8 @@ class test_nesting(Declarative):
gidnumber= [fuzzy_digits],
memberof_group = [group1],
member_user = [user1, user2],
- dn=lambda x: DN(x) == \
- DN(('cn','testgroup2'),('cn','groups'),
- ('cn','accounts'),api.env.basedn),
+ dn=DN(('cn','testgroup2'),('cn','groups'),
+ ('cn','accounts'),api.env.basedn),
),
),
),
@@ -633,9 +607,8 @@ class test_nesting(Declarative):
member_user = [user3],
member_group = [group4],
memberindirect_user = [user1, user4],
- dn=lambda x: DN(x) == \
- DN(('cn','testgroup3'),('cn','groups'),
- ('cn','accounts'),api.env.basedn),
+ dn=DN(('cn','testgroup3'),('cn','groups'),
+ ('cn','accounts'),api.env.basedn),
),
),
),
@@ -654,9 +627,8 @@ class test_nesting(Declarative):
memberof_group = [group3],
member_user = [user1, user4],
memberofindirect_group = [group1],
- dn=lambda x: DN(x) == \
- DN(('cn','testgroup4'),('cn','groups'),
- ('cn','accounts'),api.env.basedn),
+ dn=DN(('cn','testgroup4'),('cn','groups'),
+ ('cn','accounts'),api.env.basedn),
),
),
),
@@ -676,7 +648,7 @@ class test_nesting(Declarative):
value=fqdn1,
summary=u'Added host "%s"' % fqdn1,
result=dict(
- dn=lambda x: DN(x) == host_dn1,
+ dn=host_dn1,
fqdn=[fqdn1],
description=[u'Test host 1'],
l=[u'Undisclosed location 1'],
@@ -700,14 +672,13 @@ class test_nesting(Declarative):
value=hostgroup1,
summary=u'Added hostgroup "testhostgroup1"',
result=dict(
- dn=lambda x: DN(x) == hgdn1,
+ dn=hgdn1,
cn=[hostgroup1],
objectclass=objectclasses.hostgroup,
description=[u'Test hostgroup 1'],
ipauniqueid=[fuzzy_uuid],
- mepmanagedentry=lambda x: [DN(i) for i in x] == \
- [DN(('cn',hostgroup1),('cn','ng'),('cn','alt'),
- api.env.basedn)],
+ mepmanagedentry=[DN(('cn',hostgroup1),('cn','ng'),('cn','alt'),
+ api.env.basedn)],
),
),
),
@@ -722,14 +693,13 @@ class test_nesting(Declarative):
value=hostgroup2,
summary=u'Added hostgroup "testhostgroup2"',
result=dict(
- dn=lambda x: DN(x) == hgdn2,
+ dn=hgdn2,
cn=[hostgroup2],
objectclass=objectclasses.hostgroup,
description=[u'Test hostgroup 2'],
ipauniqueid=[fuzzy_uuid],
- mepmanagedentry=lambda x: [DN(i) for i in x] == \
- [DN(('cn',hostgroup2),('cn','ng'),('cn','alt'),
- api.env.basedn)],
+ mepmanagedentry=[DN(('cn',hostgroup2),('cn','ng'),('cn','alt'),
+ api.env.basedn)],
),
),
),
@@ -749,7 +719,7 @@ class test_nesting(Declarative):
),
),
result={
- 'dn': lambda x: DN(x) == hgdn2,
+ 'dn': hgdn2,
'cn': [hostgroup2],
'description': [u'Test hostgroup 2'],
'member_host': [fqdn1],
@@ -772,7 +742,7 @@ class test_nesting(Declarative):
),
),
result={
- 'dn': lambda x: DN(x) == hgdn1,
+ 'dn': hgdn1,
'cn': [hostgroup1],
'description': [u'Test hostgroup 1'],
'member_hostgroup': [hostgroup2],
@@ -788,7 +758,7 @@ class test_nesting(Declarative):
value=hostgroup1,
summary=None,
result={
- 'dn': lambda x: DN(x) == hgdn1,
+ 'dn': hgdn1,
'memberindirect_host': [u'testhost1.%s' % api.env.domain],
'member_hostgroup': [hostgroup2],
'cn': [hostgroup1],
@@ -805,7 +775,7 @@ class test_nesting(Declarative):
value=fqdn1,
summary=None,
result=dict(
- dn=lambda x: DN(x) == host_dn1,
+ dn=host_dn1,
fqdn=[fqdn1],
description=[u'Test host 1'],
l=[u'Undisclosed location 1'],
generated by cgit (git 2.34.1) at 2024-06-08 02:55:40 +0000