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

ipatests: Fix old command references in the ID views tests

Browse Source 
Make sure only new API command versions are referenced.

https://fedorahosted.org/freeipa/ticket/4839

Reviewed-By: David Kupka <dkupka@redhat.com>
This commit is contained in:
Tomas Babej 2015-01-20 17:24:15 +01:00
parent a294f10d06
commit 3341d31ec7
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ipatests/test_xmlrpc/test_idviews_plugin.py
View File

@ -64,7 +64,7 @@ def get_idview_dn(name):
) )
def get_idoverride_dn(view, anchor): def get_override_dn(view, anchor):
return Fuzzy(u"ipaanchoruuid=:IPA:{domain}:{uuid}," return Fuzzy(u"ipaanchoruuid=:IPA:{domain}:{uuid},"
"cn={view}," "cn={view},"
"cn=views,cn=accounts,{suffix}" "cn=views,cn=accounts,{suffix}"
@ -110,8 +110,7 @@ class test_idviews(Declarative):
('idview_del', [idview1, idview2], {'continue': True}), ('idview_del', [idview1, idview2], {'continue': True}),
('host_del', [host1, host2, host3, host4], {'continue': True}), ('host_del', [host1, host2, host3, host4], {'continue': True}),
('hostgroup_del', [hostgroup1, hostgroup2], {'continue': True}), ('hostgroup_del', [hostgroup1, hostgroup2], {'continue': True}),
('idoverride_del', [idview1, idoverrideuser1, idoverridegroup1], ('idview_del', [idview1], {'continue': True}),
{'continue': True}),
('user_del', [idoverrideuser1], {'continue': True}), ('user_del', [idoverrideuser1], {'continue': True}),
('group_del', [idoverridegroup1], {'continue': True}), ('group_del', [idoverridegroup1], {'continue': True}),
] ]
@ -417,7 +416,7 @@ class test_idviews(Declarative):
value=idoverrideuser1, value=idoverrideuser1,
summary=u'Added User ID override "%s"' % idoverrideuser1, summary=u'Added User ID override "%s"' % idoverrideuser1,
result=dict( result=dict(
dn=get_idoverride_dn(idview1, idoverrideuser1), dn=get_override_dn(idview1, idoverrideuser1),
objectclass=objectclasses.idoverrideuser, objectclass=objectclasses.idoverrideuser,
ipaanchoruuid=[idoverrideuser1], ipaanchoruuid=[idoverrideuser1],
ipaoriginaluid=[idoverrideuser1], ipaoriginaluid=[idoverrideuser1],
@ -451,7 +450,7 @@ class test_idviews(Declarative):
value=idoverrideuser1, value=idoverrideuser1,
summary=u'Modified an User ID override "%s"' % idoverrideuser1, summary=u'Modified an User ID override "%s"' % idoverrideuser1,
result=dict( result=dict(
dn=get_idoverride_dn(idview1, idoverrideuser1), dn=get_override_dn(idview1, idoverrideuser1),
objectclass=objectclasses.idoverrideuser, objectclass=objectclasses.idoverrideuser,
ipaanchoruuid=[idoverrideuser1], ipaanchoruuid=[idoverrideuser1],
ipaoriginaluid=[idoverrideuser1], ipaoriginaluid=[idoverrideuser1],
@ -465,7 +464,7 @@ class test_idviews(Declarative):
desc='Modify ID override "%s" to not override ' desc='Modify ID override "%s" to not override '
'uidnumber' % idoverrideuser1, 'uidnumber' % idoverrideuser1,
command=( command=(
'idoverride_mod', 'idoverrideuser_mod',
[idview1, idoverrideuser1], [idview1, idoverrideuser1],
dict(uidnumber=None, all=True) dict(uidnumber=None, all=True)
), ),
@ -473,7 +472,7 @@ class test_idviews(Declarative):
value=idoverrideuser1, value=idoverrideuser1,
summary=u'Modified an User ID override "%s"' % idoverrideuser1, summary=u'Modified an User ID override "%s"' % idoverrideuser1,
result=dict( result=dict(
dn=get_idoverride_dn(idview1, idoverrideuser1), dn=get_override_dn(idview1, idoverrideuser1),
objectclass=objectclasses.idoverrideuser, objectclass=objectclasses.idoverrideuser,
ipaanchoruuid=[idoverrideuser1], ipaanchoruuid=[idoverrideuser1],
ipaoriginaluid=[idoverrideuser1], ipaoriginaluid=[idoverrideuser1],
@ -485,7 +484,7 @@ class test_idviews(Declarative):
dict( dict(
desc='Modify ID override "%s" to override login' % idoverrideuser1, desc='Modify ID override "%s" to override login' % idoverrideuser1,
command=( command=(
'idoverride_mod', 'idoverrideuser_mod',
[idview1, idoverrideuser1], [idview1, idoverrideuser1],
dict(uid=u'newlogin', all=True) dict(uid=u'newlogin', all=True)
), ),
@ -493,7 +492,7 @@ class test_idviews(Declarative):
value=idoverrideuser1, value=idoverrideuser1,
summary=u'Modified an User ID override "%s"' % idoverrideuser1, summary=u'Modified an User ID override "%s"' % idoverrideuser1,
result=dict( result=dict(
dn=get_idoverride_dn(idview1, idoverrideuser1), dn=get_override_dn(idview1, idoverrideuser1),
objectclass=objectclasses.idoverrideuser, objectclass=objectclasses.idoverrideuser,
ipaanchoruuid=[idoverrideuser1], ipaanchoruuid=[idoverrideuser1],
ipaoriginaluid=[idoverrideuser1], ipaoriginaluid=[idoverrideuser1],
@ -516,7 +515,7 @@ class test_idviews(Declarative):
value=idoverrideuser1, value=idoverrideuser1,
summary=u'Modified an User ID override "%s"' % idoverrideuser1, summary=u'Modified an User ID override "%s"' % idoverrideuser1,
result=dict( result=dict(
dn=get_idoverride_dn(idview1, idoverrideuser1), dn=get_override_dn(idview1, idoverrideuser1),
objectclass=objectclasses.idoverrideuser, objectclass=objectclasses.idoverrideuser,
ipaanchoruuid=[idoverrideuser1], ipaanchoruuid=[idoverrideuser1],
ipaoriginaluid=[idoverrideuser1], ipaoriginaluid=[idoverrideuser1],
@ -552,7 +551,7 @@ class test_idviews(Declarative):
value=idoverrideuser1, value=idoverrideuser1,
summary=u'Added User ID override "%s"' % idoverrideuser1, summary=u'Added User ID override "%s"' % idoverrideuser1,
result=dict( result=dict(
dn=get_idoverride_dn(idview1, idoverrideuser1), dn=get_override_dn(idview1, idoverrideuser1),
objectclass=objectclasses.idoverrideuser, objectclass=objectclasses.idoverrideuser,
ipaanchoruuid=[idoverrideuser1], ipaanchoruuid=[idoverrideuser1],
ipaoriginaluid=[idoverrideuser1], ipaoriginaluid=[idoverrideuser1],
@ -575,7 +574,7 @@ class test_idviews(Declarative):
value=idoverridegroup1, value=idoverridegroup1,
summary=u'Added Group ID override "%s"' % idoverridegroup1, summary=u'Added Group ID override "%s"' % idoverridegroup1,
result=dict( result=dict(
dn=get_idoverride_dn(idview1, idoverridegroup1), dn=get_override_dn(idview1, idoverridegroup1),
objectclass=objectclasses.idoverridegroup, objectclass=objectclasses.idoverridegroup,
ipaanchoruuid=[idoverridegroup1], ipaanchoruuid=[idoverridegroup1],
description=[u'description'] description=[u'description']
@ -610,7 +609,7 @@ class test_idviews(Declarative):
summary=u'Modified an Group ID override "%s"' summary=u'Modified an Group ID override "%s"'
% idoverridegroup1, % idoverridegroup1,
result=dict( result=dict(
dn=get_idoverride_dn(idview1, idoverridegroup1), dn=get_override_dn(idview1, idoverridegroup1),
objectclass=objectclasses.idoverridegroup, objectclass=objectclasses.idoverridegroup,
ipaanchoruuid=[idoverridegroup1], ipaanchoruuid=[idoverridegroup1],
description=[u'description'], description=[u'description'],
@ -632,7 +631,7 @@ class test_idviews(Declarative):
summary=u'Modified an Group ID override "%s"' summary=u'Modified an Group ID override "%s"'
% idoverridegroup1, % idoverridegroup1,
result=dict( result=dict(
dn=get_idoverride_dn(idview1, idoverridegroup1), dn=get_override_dn(idview1, idoverridegroup1),
objectclass=objectclasses.idoverridegroup, objectclass=objectclasses.idoverridegroup,
ipaanchoruuid=[idoverridegroup1], ipaanchoruuid=[idoverridegroup1],
description=[u'description'] description=[u'description']
@ -653,7 +652,7 @@ class test_idviews(Declarative):
summary=u'Modified an Group ID override "%s"' summary=u'Modified an Group ID override "%s"'
% idoverridegroup1, % idoverridegroup1,
result=dict( result=dict(
dn=get_idoverride_dn(idview1, idoverridegroup1), dn=get_override_dn(idview1, idoverridegroup1),
objectclass=objectclasses.idoverridegroup, objectclass=objectclasses.idoverridegroup,
ipaanchoruuid=[idoverridegroup1], ipaanchoruuid=[idoverridegroup1],
description=[u'description'], description=[u'description'],
@ -686,7 +685,7 @@ class test_idviews(Declarative):
value=idoverridegroup1, value=idoverridegroup1,
summary=u'Added Group ID override "%s"' % idoverridegroup1, summary=u'Added Group ID override "%s"' % idoverridegroup1,
result=dict( result=dict(
dn=get_idoverride_dn(idview1, idoverridegroup1), dn=get_override_dn(idview1, idoverridegroup1),
objectclass=objectclasses.idoverridegroup, objectclass=objectclasses.idoverridegroup,
ipaanchoruuid=[idoverridegroup1], ipaanchoruuid=[idoverridegroup1],
description=[u'description'], description=[u'description'],
@ -1296,7 +1295,7 @@ class test_idviews(Declarative):
value=idoverrideuser1, value=idoverrideuser1,
summary=u'Added User ID override "%s"' % idoverrideuser1, summary=u'Added User ID override "%s"' % idoverrideuser1,
result=dict( result=dict(
dn=get_idoverride_dn(idview1, idoverrideuser1), dn=get_override_dn(idview1, idoverrideuser1),
objectclass=objectclasses.idoverrideuser, objectclass=objectclasses.idoverrideuser,
ipaanchoruuid=[idoverrideuser1], ipaanchoruuid=[idoverrideuser1],
ipaoriginaluid=[idoverrideuser1], ipaoriginaluid=[idoverrideuser1],
@ -1316,7 +1315,7 @@ class test_idviews(Declarative):
value=idoverridegroup1, value=idoverridegroup1,
summary=u'Added Group ID override "%s"' % idoverridegroup1, summary=u'Added Group ID override "%s"' % idoverridegroup1,
result=dict( result=dict(
dn=get_idoverride_dn(idview1, idoverridegroup1), dn=get_override_dn(idview1, idoverridegroup1),
objectclass=objectclasses.idoverridegroup, objectclass=objectclasses.idoverridegroup,
ipaanchoruuid=[idoverridegroup1], ipaanchoruuid=[idoverridegroup1],
description=[u'description'], description=[u'description'],