summaryrefslogtreecommitdiffstats
path: root/ipatests/test_xmlrpc/test_attr.py
diff options
context:
space:
mode:
authorAna Krivokapic <akrivoka@redhat.com>2013-08-20 15:34:39 +0200
committerPetr Viktorin <pviktori@redhat.com>2013-08-28 16:45:57 +0200
commit196c4b5f53c5ae9d6a471ed2da1eea4d78746fcb (patch)
tree9a8fcd91ac7147df1fd67b29a1325881f3ae8662 /ipatests/test_xmlrpc/test_attr.py
parentfed7e7b23182ef0355cdaf6a712d8cce84382872 (diff)
downloadfreeipa-196c4b5f53c5ae9d6a471ed2da1eea4d78746fcb.tar.gz
freeipa-196c4b5f53c5ae9d6a471ed2da1eea4d78746fcb.tar.xz
freeipa-196c4b5f53c5ae9d6a471ed2da1eea4d78746fcb.zip
Fix tests which fail after ipa-adtrust-install
Some unit tests were failing after ipa-adtrust-install has been run on the IPA server, due to missing attributes ('ipantsecurityidentifier') and objectclasses ('ipantuserattrs' and 'ipantgroupattrs'). This patch detects if ipa-adtrust-install has been run, and adds missing attributes and objectclasses where appropriate. https://fedorahosted.org/freeipa/ticket/3852
Diffstat (limited to 'ipatests/test_xmlrpc/test_attr.py')
-rw-r--r--ipatests/test_xmlrpc/test_attr.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/ipatests/test_xmlrpc/test_attr.py b/ipatests/test_xmlrpc/test_attr.py
index ef5b882c5..118eabdeb 100644
--- a/ipatests/test_xmlrpc/test_attr.py
+++ b/ipatests/test_xmlrpc/test_attr.py
@@ -23,7 +23,7 @@ Test --setattr and --addattr and other attribute-specific issues
from ipalib import api, errors
from ipatests.test_xmlrpc import objectclasses
-from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
+from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid, add_sid, add_oc
from ipapython.dn import DN
user1=u'tuser1'
@@ -55,13 +55,13 @@ class test_attr(Declarative):
expected=dict(
value=user1,
summary=u'Added user "tuser1"',
- result=dict(
+ result=add_sid(dict(
gecos=[u'Test User1'],
givenname=[u'Test'],
homedirectory=[u'/home/tuser1'],
krbprincipalname=[u'tuser1@' + api.env.realm],
loginshell=[u'/bin/sh'],
- objectclass=objectclasses.user,
+ objectclass=add_oc(objectclasses.user, u'ipantuserattrs'),
sn=[u'User1'],
uid=[user1],
uidnumber=[fuzzy_digits],
@@ -80,7 +80,7 @@ class test_attr(Declarative):
api.env.basedn),
has_keytab=False,
has_password=False,
- ),
+ )),
),
),