summaryrefslogtreecommitdiffstats
path: root/ipatests
diff options
context:
space:
mode:
authorTomas Babej <tbabej@redhat.com>2015-01-21 16:44:47 +0100
committerTomas Babej <tbabej@redhat.com>2015-01-26 13:01:33 +0100
commitf83b4fe3306071622ae6264f71843a2e20731262 (patch)
tree6de3f428ab9a4ca06d46a72d6a6bcbb9c25a6c31 /ipatests
parent3341d31ec72db9b532be7610878083360a5b38c0 (diff)
downloadfreeipa-f83b4fe3306071622ae6264f71843a2e20731262.tar.gz
freeipa-f83b4fe3306071622ae6264f71843a2e20731262.tar.xz
freeipa-f83b4fe3306071622ae6264f71843a2e20731262.zip
ipatests: Fix incorrect assumptions in idviews tests
https://fedorahosted.org/freeipa/ticket/4839 Reviewed-By: David Kupka <dkupka@redhat.com>
Diffstat (limited to 'ipatests')
-rw-r--r--ipatests/test_xmlrpc/test_idviews_plugin.py20
1 files changed, 8 insertions, 12 deletions
diff --git a/ipatests/test_xmlrpc/test_idviews_plugin.py b/ipatests/test_xmlrpc/test_idviews_plugin.py
index 94ff42495..e4e7e553b 100644
--- a/ipatests/test_xmlrpc/test_idviews_plugin.py
+++ b/ipatests/test_xmlrpc/test_idviews_plugin.py
@@ -334,9 +334,7 @@ class test_idviews(Declarative):
command=('idoverrideuser_mod',
[idview1, idoverrideuser1],
dict(uid=u'randomuser')),
- expected=errors.NotFound(
- reason=u'%s: User ID override not found' % idoverrideuser1
- ),
+ expected=errors.NotFound(reason=u'no such entry'),
),
dict(
@@ -356,9 +354,7 @@ class test_idviews(Declarative):
command=('idoverrideuser_mod',
[idview1, idoverrideuser1],
dict(setattr=u'ipaanchoruuid=:IPA:dom:renamedoverride')),
- expected=errors.NotFound(
- reason=u'%s: User ID override not found' % idoverrideuser1
- ),
+ expected=errors.NotFound(reason=u'no such entry'),
),
dict(
@@ -521,7 +517,7 @@ class test_idviews(Declarative):
ipaoriginaluid=[idoverrideuser1],
description=[u'description'],
homedirectory=[u'/home/newhome'],
- uidnumber=[u'12345']
+ uid=[u'newlogin'],
)
),
),
@@ -957,7 +953,7 @@ class test_idviews(Declarative):
managing_host=[get_fqdn(host3)],
objectclass=objectclasses.host,
serverhostname=[host3],
- ipaassignedidview=[get_idview_dn(idview1)],
+ ipaassignedidview=[idview1],
),
),
),
@@ -1037,7 +1033,7 @@ class test_idviews(Declarative):
serverhostname=[host2],
memberof_hostgroup=[hostgroup2],
memberofindirect_hostgroup=[hostgroup1],
- ipaassignedidview=[get_idview_dn(idview1)],
+ ipaassignedidview=[idview1],
),
),
),
@@ -1065,7 +1061,7 @@ class test_idviews(Declarative):
objectclass=objectclasses.host,
serverhostname=[host1],
memberof_hostgroup=[hostgroup1],
- ipaassignedidview=[get_idview_dn(idview1)],
+ ipaassignedidview=[idview1],
),
),
),
@@ -1189,11 +1185,11 @@ class test_idviews(Declarative):
),
dict(
- desc=u'Unapply %s from %s' % (idview1, hostgroup1),
+ desc=u'Unapply %s from %s' % (idview1, hostgroup2),
command=(
'idview_unapply',
[],
- dict(hostgroup=hostgroup1),
+ dict(hostgroup=hostgroup2),
),
expected=dict(
completed=1,