diff options
author | Ana Krivokapic <akrivoka@redhat.com> | 2013-08-20 15:34:39 +0200 |
---|---|---|
committer | Petr Viktorin <pviktori@redhat.com> | 2013-08-28 16:45:57 +0200 |
commit | 196c4b5f53c5ae9d6a471ed2da1eea4d78746fcb (patch) | |
tree | 9a8fcd91ac7147df1fd67b29a1325881f3ae8662 /ipatests/test_xmlrpc/test_netgroup_plugin.py | |
parent | fed7e7b23182ef0355cdaf6a712d8cce84382872 (diff) | |
download | freeipa-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_netgroup_plugin.py')
-rw-r--r-- | ipatests/test_xmlrpc/test_netgroup_plugin.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ipatests/test_xmlrpc/test_netgroup_plugin.py b/ipatests/test_xmlrpc/test_netgroup_plugin.py index 3dccac1b..09241a7d 100644 --- a/ipatests/test_xmlrpc/test_netgroup_plugin.py +++ b/ipatests/test_xmlrpc/test_netgroup_plugin.py @@ -26,8 +26,8 @@ import krbV from ipalib import api from ipalib import errors from ipaserver.plugins.ldap2 import ldap2 -from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits, - fuzzy_uuid, fuzzy_netgroupdn) +from xmlrpc_test import (Declarative, fuzzy_digits, fuzzy_uuid, + fuzzy_netgroupdn, add_sid, add_oc) from ipatests.test_xmlrpc import objectclasses from ipapython.dn import DN @@ -272,13 +272,13 @@ class test_netgroup(Declarative): expected=dict( value=user1, summary=u'Added user "%s"' % user1, - result=dict( + result=add_sid(dict( gecos=[u'Test User1'], givenname=[u'Test'], homedirectory=[u'/home/%s' % user1], krbprincipalname=[u'%s@%s' % (user1, 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], @@ -297,7 +297,7 @@ class test_netgroup(Declarative): has_password=False, dn=DN(('uid',user1),('cn','users'),('cn','accounts'), api.env.basedn), - ), + )), ), ), @@ -309,13 +309,13 @@ class test_netgroup(Declarative): expected=dict( value=user2, summary=u'Added user "%s"' % user2, - result=dict( + result=add_sid(dict( gecos=[u'Test User2'], givenname=[u'Test'], homedirectory=[u'/home/%s' % user2], krbprincipalname=[u'%s@%s' % (user2, api.env.realm)], loginshell=[u'/bin/sh'], - objectclass=objectclasses.user, + objectclass=add_oc(objectclasses.user, u'ipantuserattrs'), sn=[u'User2'], uid=[user2], uidnumber=[fuzzy_digits], @@ -334,7 +334,7 @@ class test_netgroup(Declarative): has_password=False, dn=DN(('uid',user2),('cn','users'),('cn','accounts'), api.env.basedn), - ), + )), ), ), |