summaryrefslogtreecommitdiffstats
path: root/tests/test_xmlrpc/test_sudocmdgroup_plugin.py
diff options
context:
space:
mode:
Diffstat (limited to 'tests/test_xmlrpc/test_sudocmdgroup_plugin.py')
-rw-r--r--tests/test_xmlrpc/test_sudocmdgroup_plugin.py102
1 files changed, 41 insertions, 61 deletions
diff --git a/tests/test_xmlrpc/test_sudocmdgroup_plugin.py b/tests/test_xmlrpc/test_sudocmdgroup_plugin.py
index 2bfbb6259..b8c15737d 100644
--- a/tests/test_xmlrpc/test_sudocmdgroup_plugin.py
+++ b/tests/test_xmlrpc/test_sudocmdgroup_plugin.py
@@ -23,7 +23,7 @@ Test the `ipalib/plugins/sudocmdgroup.py` module.
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
sudocmdgroup1 = u'testsudocmdgroup1'
sudocmdgroup2 = u'testsudocmdgroup2'
@@ -45,9 +45,8 @@ def create_command(sudocmd):
sudocmd=[sudocmd],
ipauniqueid=[fuzzy_uuid],
description=[u'Test sudo command'],
- dn=lambda x: DN(x) == \
- DN(('sudocmd',sudocmd),('cn','sudocmds'),('cn','sudo'),
- api.env.basedn),
+ dn=DN(('sudocmd',sudocmd),('cn','sudocmds'),('cn','sudo'),
+ api.env.basedn),
),
),
)
@@ -77,9 +76,8 @@ class test_sudocmdgroup(Declarative):
sudocmd=[u'/usr/bin/sudotestcmd1'],
ipauniqueid=[fuzzy_uuid],
description=[u'Test sudo command 1'],
- dn=lambda x: DN(x) == \
- DN(('sudocmd',sudocmd1),('cn','sudocmds'),('cn','sudo'),
- api.env.basedn),
+ dn=DN(('sudocmd',sudocmd1),('cn','sudocmds'),('cn','sudo'),
+ api.env.basedn),
),
),
),
@@ -94,9 +92,8 @@ class test_sudocmdgroup(Declarative):
result=dict(
sudocmd=[sudocmd1],
description=[u'Test sudo command 1'],
- dn=lambda x: DN(x) == \
- DN(('sudocmd',sudocmd1),('cn','sudocmds'),('cn','sudo'),
- api.env.basedn),
+ dn=DN(('sudocmd',sudocmd1),('cn','sudocmds'),('cn','sudo'),
+ api.env.basedn),
),
),
),
@@ -143,9 +140,8 @@ class test_sudocmdgroup(Declarative):
description=[u'Test desc 1'],
objectclass=objectclasses.sudocmdgroup,
ipauniqueid=[fuzzy_uuid],
- dn=lambda x: DN(x) == \
- DN(('cn','testsudocmdgroup1'),('cn','sudocmdgroups'),
- ('cn','sudo'),api.env.basedn),
+ dn=DN(('cn','testsudocmdgroup1'),('cn','sudocmdgroups'),
+ ('cn','sudo'),api.env.basedn),
),
),
),
@@ -171,9 +167,8 @@ class test_sudocmdgroup(Declarative):
result=dict(
cn=[sudocmdgroup1],
description=[u'Test desc 1'],
- dn=lambda x: DN(x) == \
- DN(('cn','testsudocmdgroup1'),('cn','sudocmdgroups'),
- ('cn','sudo'),api.env.basedn),
+ dn=DN(('cn','testsudocmdgroup1'),('cn','sudocmdgroups'),
+ ('cn','sudo'),api.env.basedn),
),
),
),
@@ -204,9 +199,8 @@ class test_sudocmdgroup(Declarative):
result=dict(
cn=[sudocmdgroup1],
description=[u'New desc 1'],
- dn=lambda x: DN(x) == \
- DN(('cn','testsudocmdgroup1'),('cn','sudocmdgroups'),
- ('cn','sudo'),api.env.basedn),
+ dn=DN(('cn','testsudocmdgroup1'),('cn','sudocmdgroups'),
+ ('cn','sudo'),api.env.basedn),
),
summary=None,
),
@@ -221,9 +215,8 @@ class test_sudocmdgroup(Declarative):
truncated=False,
result=[
dict(
- dn=lambda x: DN(x) == \
- DN(('cn',sudocmdgroup1),('cn','sudocmdgroups'),
- ('cn','sudo'),api.env.basedn),
+ dn=DN(('cn',sudocmdgroup1),('cn','sudocmdgroups'),
+ ('cn','sudo'),api.env.basedn),
cn=[sudocmdgroup1],
description=[u'New desc 1'],
),
@@ -275,9 +268,8 @@ class test_sudocmdgroup(Declarative):
description=[u'Test desc 2'],
objectclass=objectclasses.sudocmdgroup,
ipauniqueid=[fuzzy_uuid],
- dn=lambda x: DN(x) == \
- DN(('cn','testsudocmdgroup2'),('cn','sudocmdgroups'),
- ('cn','sudo'),api.env.basedn),
+ dn=DN(('cn','testsudocmdgroup2'),('cn','sudocmdgroups'),
+ ('cn','sudo'),api.env.basedn),
),
),
),
@@ -304,9 +296,8 @@ class test_sudocmdgroup(Declarative):
result=dict(
cn=[sudocmdgroup2],
description=[u'Test desc 2'],
- dn=lambda x: DN(x) == \
- DN(('cn','testsudocmdgroup2'),('cn','sudocmdgroups'),
- ('cn','sudo'),api.env.basedn),
+ dn=DN(('cn','testsudocmdgroup2'),('cn','sudocmdgroups'),
+ ('cn','sudo'),api.env.basedn),
),
),
),
@@ -337,9 +328,8 @@ class test_sudocmdgroup(Declarative):
result=dict(
cn=[sudocmdgroup2],
description=[u'New desc 2'],
- dn=lambda x: DN(x) == \
- DN(('cn','testsudocmdgroup2'),('cn','sudocmdgroups'),
- ('cn','sudo'),api.env.basedn),
+ dn=DN(('cn','testsudocmdgroup2'),('cn','sudocmdgroups'),
+ ('cn','sudo'),api.env.basedn),
),
summary=None,
),
@@ -354,9 +344,8 @@ class test_sudocmdgroup(Declarative):
truncated=False,
result=[
dict(
- dn=lambda x: DN(x) == \
- DN(('cn',sudocmdgroup2),('cn','sudocmdgroups'),
- ('cn','sudo'),api.env.basedn),
+ dn=DN(('cn',sudocmdgroup2),('cn','sudocmdgroups'),
+ ('cn','sudo'),api.env.basedn),
cn=[sudocmdgroup2],
description=[u'New desc 2'],
),
@@ -375,16 +364,14 @@ class test_sudocmdgroup(Declarative):
truncated=False,
result=[
dict(
- dn=lambda x: DN(x) == \
- DN(('cn',sudocmdgroup1),('cn','sudocmdgroups'),
- ('cn','sudo'),api.env.basedn),
+ dn=DN(('cn',sudocmdgroup1),('cn','sudocmdgroups'),
+ ('cn','sudo'),api.env.basedn),
cn=[sudocmdgroup1],
description=[u'New desc 1'],
),
dict(
- dn=lambda x: DN(x) == \
- DN(('cn',sudocmdgroup2),('cn','sudocmdgroups'),
- ('cn','sudo'),api.env.basedn),
+ dn=DN(('cn',sudocmdgroup2),('cn','sudocmdgroups'),
+ ('cn','sudo'),api.env.basedn),
cn=[sudocmdgroup2],
description=[u'New desc 2'],
),
@@ -410,9 +397,8 @@ class test_sudocmdgroup(Declarative):
),
),
result={
- 'dn': lambda x: DN(x) == \
- DN(('cn',sudocmdgroup1),('cn','sudocmdgroups'),
- ('cn','sudo'),api.env.basedn),
+ 'dn': DN(('cn',sudocmdgroup1),('cn','sudocmdgroups'),
+ ('cn','sudo'),api.env.basedn),
'member_sudocmd': (sudocmd1,),
'cn': [sudocmdgroup1],
'description': [u'New desc 1'],
@@ -427,9 +413,8 @@ class test_sudocmdgroup(Declarative):
value=sudocmd1,
summary=None,
result=dict(
- dn=lambda x: DN(x) == \
- DN(('sudocmd',sudocmd1),('cn','sudocmds'),('cn','sudo'),
- api.env.basedn),
+ dn=DN(('sudocmd',sudocmd1),('cn','sudocmds'),('cn','sudo'),
+ api.env.basedn),
sudocmd=[sudocmd1],
description=[u'Test sudo command 1'],
memberof_sudocmdgroup = [u'testsudocmdgroup1'],
@@ -451,9 +436,8 @@ class test_sudocmdgroup(Declarative):
),
),
result={
- 'dn': lambda x: DN(x) == \
- DN(('cn',sudocmdgroup1),('cn','sudocmdgroups'),
- ('cn','sudo'),api.env.basedn),
+ 'dn': DN(('cn',sudocmdgroup1),('cn','sudocmdgroups'),
+ ('cn','sudo'),api.env.basedn),
'member_sudocmd': (u'/usr/bin/sudotestcmd1',),
'cn': [sudocmdgroup1],
'description': [u'New desc 1'],
@@ -474,9 +458,8 @@ class test_sudocmdgroup(Declarative):
),
),
result={
- 'dn': lambda x: DN(x) == \
- DN(('cn',sudocmdgroup1),('cn','sudocmdgroups'),
- ('cn','sudo'),api.env.basedn),
+ 'dn': DN(('cn',sudocmdgroup1),('cn','sudocmdgroups'),
+ ('cn','sudo'),api.env.basedn),
'cn': [sudocmdgroup1],
'description': [u'New desc 1'],
},
@@ -497,9 +480,8 @@ class test_sudocmdgroup(Declarative):
),
),
result={
- 'dn': lambda x: DN(x) == \
- DN(('cn',sudocmdgroup1),('cn','sudocmdgroups'),
- ('cn','sudo'),api.env.basedn),
+ 'dn': DN(('cn',sudocmdgroup1),('cn','sudocmdgroups'),
+ ('cn','sudo'),api.env.basedn),
'cn': [sudocmdgroup1],
'description': [u'New desc 1'],
},
@@ -523,9 +505,8 @@ class test_sudocmdgroup(Declarative):
),
),
result={
- 'dn': lambda x: DN(x) == \
- DN(('cn',sudocmdgroup1),('cn','sudocmdgroups'),
- ('cn','sudo'),api.env.basedn),
+ 'dn': DN(('cn',sudocmdgroup1),('cn','sudocmdgroups'),
+ ('cn','sudo'),api.env.basedn),
'member_sudocmd': (sudocmd_plus,),
'cn': [sudocmdgroup1],
'description': [u'New desc 1'],
@@ -546,9 +527,8 @@ class test_sudocmdgroup(Declarative):
),
),
result={
- 'dn': lambda x: DN(x) == \
- DN(('cn',sudocmdgroup1),('cn','sudocmdgroups'),
- ('cn','sudo'),api.env.basedn),
+ 'dn': DN(('cn',sudocmdgroup1),('cn','sudocmdgroups'),
+ ('cn','sudo'),api.env.basedn),
'cn': [sudocmdgroup1],
'description': [u'New desc 1'],
},