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:46:15 +0200 |
| commit | c392146101422808b8781c85f0f2720db230da28 (patch) | |
| tree | 095acec64a62aefff7dc498602d05e38af31f626 /ipatests/test_xmlrpc/test_automember_plugin.py | |
| parent | 023385510a1b9ce6b40e40b788044ba853463696 (diff) | |
| download | freeipa.git-c392146101422808b8781c85f0f2720db230da28.tar.gz freeipa.git-c392146101422808b8781c85f0f2720db230da28.tar.xz freeipa.git-c392146101422808b8781c85f0f2720db230da28.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_automember_plugin.py')
| -rw-r--r-- | ipatests/test_xmlrpc/test_automember_plugin.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ipatests/test_xmlrpc/test_automember_plugin.py b/ipatests/test_xmlrpc/test_automember_plugin.py index a50860e6..2c38b646 100644 --- a/ipatests/test_xmlrpc/test_automember_plugin.py +++ b/ipatests/test_xmlrpc/test_automember_plugin.py @@ -24,7 +24,7 @@ Test the `ipalib/plugins/automember.py` module. from ipalib import api, errors from ipapython.dn import DN 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 user1=u'tuser1' @@ -794,7 +794,7 @@ class test_automember(Declarative): expected=dict( value=manager1, summary=u'Added user "mscott"', - result=dict( + result=add_sid(dict( gecos=[u'Michael Scott'], givenname=[u'Michael'], homedirectory=[u'/home/mscott'], @@ -802,7 +802,7 @@ class test_automember(Declarative): has_keytab=False, has_password=False, loginshell=[u'/bin/sh'], - objectclass=objectclasses.user, + objectclass=add_oc(objectclasses.user, u'ipantuserattrs'), sn=[u'Scott'], uid=[manager1], uidnumber=[fuzzy_digits], @@ -819,7 +819,7 @@ class test_automember(Declarative): memberof_group=[u'defaultgroup1', u'ipausers'], dn=DN(('uid', 'mscott'), ('cn', 'users'), ('cn', 'accounts'), api.env.basedn), - ), + )), ), ), @@ -832,7 +832,7 @@ class test_automember(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'], @@ -840,7 +840,7 @@ class test_automember(Declarative): has_keytab=False, has_password=False, loginshell=[u'/bin/sh'], - objectclass=objectclasses.user, + objectclass=add_oc(objectclasses.user, u'ipantuserattrs'), sn=[u'User1'], uid=[user1], uidnumber=[fuzzy_digits], @@ -858,7 +858,7 @@ class test_automember(Declarative): memberof_group=[u'group1', u'ipausers'], dn=DN(('uid', 'tuser1'), ('cn', 'users'), ('cn', 'accounts'), api.env.basedn), - ), + )), ), ), |