From 196c4b5f53c5ae9d6a471ed2da1eea4d78746fcb Mon Sep 17 00:00:00 2001 From: Ana Krivokapic Date: Tue, 20 Aug 2013 15:34:39 +0200 Subject: 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 --- ipatests/test_xmlrpc/test_replace.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ipatests/test_xmlrpc/test_replace.py') diff --git a/ipatests/test_xmlrpc/test_replace.py b/ipatests/test_xmlrpc/test_replace.py index 281714b3..1b946b76 100644 --- a/ipatests/test_xmlrpc/test_replace.py +++ b/ipatests/test_xmlrpc/test_replace.py @@ -25,9 +25,9 @@ Note that member management in other tests also exercises the gen_modlist code. """ -from ipalib import api, errors +from ipalib import api 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' @@ -50,13 +50,13 @@ class test_replace(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], @@ -75,7 +75,7 @@ class test_replace(Declarative): has_password=False, dn=DN(('uid','tuser1'),('cn','users'),('cn','accounts'), api.env.basedn), - ), + )), ), ), -- cgit