ipatests: Fix incorrect assumptions in idviews tests

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

Reviewed-By: David Kupka <dkupka@redhat.com>
This commit is contained in:
Tomas Babej 2015-01-21 16:44:47 +01:00
parent 3341d31ec7
commit f83b4fe330

View File

@ -334,9 +334,7 @@ class test_idviews(Declarative):
command=('idoverrideuser_mod', command=('idoverrideuser_mod',
[idview1, idoverrideuser1], [idview1, idoverrideuser1],
dict(uid=u'randomuser')), dict(uid=u'randomuser')),
expected=errors.NotFound( expected=errors.NotFound(reason=u'no such entry'),
reason=u'%s: User ID override not found' % idoverrideuser1
),
), ),
dict( dict(
@ -356,9 +354,7 @@ class test_idviews(Declarative):
command=('idoverrideuser_mod', command=('idoverrideuser_mod',
[idview1, idoverrideuser1], [idview1, idoverrideuser1],
dict(setattr=u'ipaanchoruuid=:IPA:dom:renamedoverride')), dict(setattr=u'ipaanchoruuid=:IPA:dom:renamedoverride')),
expected=errors.NotFound( expected=errors.NotFound(reason=u'no such entry'),
reason=u'%s: User ID override not found' % idoverrideuser1
),
), ),
dict( dict(
@ -521,7 +517,7 @@ class test_idviews(Declarative):
ipaoriginaluid=[idoverrideuser1], ipaoriginaluid=[idoverrideuser1],
description=[u'description'], description=[u'description'],
homedirectory=[u'/home/newhome'], homedirectory=[u'/home/newhome'],
uidnumber=[u'12345'] uid=[u'newlogin'],
) )
), ),
), ),
@ -957,7 +953,7 @@ class test_idviews(Declarative):
managing_host=[get_fqdn(host3)], managing_host=[get_fqdn(host3)],
objectclass=objectclasses.host, objectclass=objectclasses.host,
serverhostname=[host3], serverhostname=[host3],
ipaassignedidview=[get_idview_dn(idview1)], ipaassignedidview=[idview1],
), ),
), ),
), ),
@ -1037,7 +1033,7 @@ class test_idviews(Declarative):
serverhostname=[host2], serverhostname=[host2],
memberof_hostgroup=[hostgroup2], memberof_hostgroup=[hostgroup2],
memberofindirect_hostgroup=[hostgroup1], memberofindirect_hostgroup=[hostgroup1],
ipaassignedidview=[get_idview_dn(idview1)], ipaassignedidview=[idview1],
), ),
), ),
), ),
@ -1065,7 +1061,7 @@ class test_idviews(Declarative):
objectclass=objectclasses.host, objectclass=objectclasses.host,
serverhostname=[host1], serverhostname=[host1],
memberof_hostgroup=[hostgroup1], memberof_hostgroup=[hostgroup1],
ipaassignedidview=[get_idview_dn(idview1)], ipaassignedidview=[idview1],
), ),
), ),
), ),
@ -1189,11 +1185,11 @@ class test_idviews(Declarative):
), ),
dict( dict(
desc=u'Unapply %s from %s' % (idview1, hostgroup1), desc=u'Unapply %s from %s' % (idview1, hostgroup2),
command=( command=(
'idview_unapply', 'idview_unapply',
[], [],
dict(hostgroup=hostgroup1), dict(hostgroup=hostgroup2),
), ),
expected=dict( expected=dict(
completed=1, completed=1,