diff options
Diffstat (limited to 'tests/test_xmlrpc/test_attr.py')
| -rw-r--r-- | tests/test_xmlrpc/test_attr.py | 104 |
1 files changed, 11 insertions, 93 deletions
diff --git a/tests/test_xmlrpc/test_attr.py b/tests/test_xmlrpc/test_attr.py index f5003c403..799c77939 100644 --- a/tests/test_xmlrpc/test_attr.py +++ b/tests/test_xmlrpc/test_attr.py @@ -21,29 +21,17 @@ Test --setattr and --addattr and other attribute-specific issues """ -from ipalib import api, errors, x509 +from ipalib import api, errors from tests.test_xmlrpc import objectclasses -from xmlrpc_test import (Declarative, fuzzy_digits, fuzzy_uuid, fuzzy_date, - fuzzy_hex, fuzzy_hash, fuzzy_issuer) -from ipalib.dn import * -import base64 - -user1 = u'tuser1' -fqdn1 = u'testhost1.%s' % api.env.domain - -# We can use the same cert we generated for the service tests -fd = open('tests/test_xmlrpc/service.crt', 'r') -servercert = fd.readlines() -servercert = u''.join(servercert) -servercert = x509.strip_header(servercert) -servercert = servercert.replace('\n', '') -fd.close() +from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid +from ipapython.dn import DN + +user1=u'tuser1' class test_attr(Declarative): cleanup_commands = [ ('user_del', [user1], {}), - ('host_del', [fqdn1], {}), ] tests = [ @@ -72,16 +60,13 @@ class test_attr(Declarative): cn=[u'Test User1'], initials=[u'TU'], ipauniqueid=[fuzzy_uuid], - krbpwdpolicyreference=lambda x: [DN(i) for i in x] == \ - [DN(('cn','global_policy'),('cn',api.env.realm), - ('cn','kerberos'),api.env.basedn)], - mepmanagedentry=lambda x: [DN(i) for i in x] == \ - [DN(('cn',user1),('cn','groups'),('cn','accounts'), - api.env.basedn)], + krbpwdpolicyreference=[DN(('cn','global_policy'),('cn',api.env.realm), + ('cn','kerberos'),api.env.basedn)], + mepmanagedentry=[DN(('cn',user1),('cn','groups'),('cn','accounts'), + api.env.basedn)], memberof_group=[u'ipausers'], - dn=lambda x: DN(x) == \ - DN(('uid','tuser1'),('cn','users'),('cn','accounts'), - api.env.basedn), + dn=DN(('uid','tuser1'),('cn','users'),('cn','accounts'), + api.env.basedn), has_keytab=False, has_password=False, ), @@ -563,71 +548,4 @@ class test_attr(Declarative): desc='Server is unwilling to perform', info=''), ), - dict( - desc='Try to create %r with description and --addattr description' % fqdn1, - command=('host_add', [fqdn1], - dict( - description=u'Test host 1', - addattr=u'description=Test host 2', - force=True, - ), - ), - expected=errors.OnlyOneValueAllowed(attr='description'), - ), - - dict( - desc='Create %r with a certificate' % fqdn1, - command=('host_add', [fqdn1], - dict( - usercertificate=servercert, - force=True, - ), - ), - expected=dict( - value=fqdn1, - summary=u'Added host "%s"' % fqdn1, - result=dict( - dn=lambda x: DN(x) == DN(('fqdn',fqdn1),('cn','computers'), - ('cn','accounts'),api.env.basedn), - fqdn=[fqdn1], - krbprincipalname=[u'host/%s@%s' % (fqdn1, api.env.realm)], - objectclass=objectclasses.host, - ipauniqueid=[fuzzy_uuid], - managedby_host=[fqdn1], - usercertificate=[base64.b64decode(servercert)], - valid_not_before=fuzzy_date, - valid_not_after=fuzzy_date, - subject=lambda x: DN(x) == \ - DN(('CN',api.env.host),x509.subject_base()), - serial_number=fuzzy_digits, - serial_number_hex=fuzzy_hex, - md5_fingerprint=fuzzy_hash, - sha1_fingerprint=fuzzy_hash, - issuer=fuzzy_issuer, - has_keytab=False, - has_password=False, - ), - ), - ), - - dict( - desc='Remove %r certificate using --delattr' % fqdn1, - command=('host_mod', [fqdn1], - dict( - delattr=u'usercertificate=%s' % servercert, - ), - ), - expected=dict( - value=fqdn1, - summary=u'Modified host "%s"' % fqdn1, - result=dict( - fqdn=[fqdn1], - krbprincipalname=[u'host/%s@%s' % (fqdn1, api.env.realm)], - managedby_host=[fqdn1], - has_keytab=False, - has_password=False, - ), - ), - ), - ] |