mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
Fix a slew of tests.
- Skip the DNS tests if DNS isn't configured - Add new attributes to user entries (displayname, cn and initials) - Make the nsaccountlock value consistent - Fix the cert subject for cert tests
This commit is contained in:
parent
623abc6bdf
commit
ffc967b47a
@ -246,7 +246,7 @@ changetype: add
|
||||
objectClass: top
|
||||
objectClass: cosTemplate
|
||||
objectClass: extensibleobject
|
||||
nsAccountLock: true
|
||||
nsAccountLock: True
|
||||
cosPriority: 1
|
||||
|
||||
dn: cn=inactivated,cn=account inactivation,cn=accounts,$SUFFIX
|
||||
@ -259,7 +259,7 @@ changetype: add
|
||||
objectClass: top
|
||||
objectClass: cosTemplate
|
||||
objectClass: extensibleobject
|
||||
nsAccountLock: false
|
||||
nsAccountLock: False
|
||||
cosPriority: 0
|
||||
|
||||
dn: cn=Activated,cn=Account Inactivation,cn=accounts,$SUFFIX
|
||||
|
@ -92,7 +92,7 @@ class test_cert(XMLRPC_test):
|
||||
"""
|
||||
host_fqdn = u'ipatestcert.%s' % api.env.domain
|
||||
service_princ = u'test/%s@%s' % (host_fqdn, api.env.realm)
|
||||
subject = 'CN=%s,O=IPA' % host_fqdn
|
||||
subject = 'CN=%s,O=%s' % (host_fqdn, api.env.realm)
|
||||
|
||||
def test_1_cert_add(self):
|
||||
"""
|
||||
|
@ -20,6 +20,7 @@
|
||||
Test the `ipalib/plugins/dns.py` module.
|
||||
"""
|
||||
|
||||
import nose
|
||||
from ipalib import api, errors
|
||||
from tests.test_xmlrpc import objectclasses
|
||||
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
|
||||
@ -29,6 +30,19 @@ dnsres1 = u'testdnsres'
|
||||
|
||||
class test_dns(Declarative):
|
||||
|
||||
def setUp(self):
|
||||
super(test_dns, self).setUp()
|
||||
try:
|
||||
api.Command['dnszone_add'](dnszone1,
|
||||
idnssoamname = u'ns1.%s' % dnszone1,
|
||||
idnssoarname = u'root.%s' % dnszone1,
|
||||
)
|
||||
api.Command['dnszone_del'](dnszone1)
|
||||
except errors.NotFound:
|
||||
raise nose.SkipTest('DNS is not configured')
|
||||
except errors.DuplicateEntry:
|
||||
pass
|
||||
|
||||
cleanup_commands = [
|
||||
('dnszone_del', [dnszone1], {}),
|
||||
('dnsrecord_del', [dnszone1, dnsres1], {}),
|
||||
|
@ -585,6 +585,9 @@ class test_group(Declarative):
|
||||
sn=[u'User1'],
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
displayname=[u'Test User1'],
|
||||
cn=[u'Test User1'],
|
||||
initials=[u'TU'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
dn=u'uid=%s,cn=users,cn=accounts,%s' % (user1, api.env.basedn),
|
||||
),
|
||||
|
@ -125,6 +125,9 @@ class test_group(Declarative):
|
||||
sn=[u'User1'],
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
displayname=[u'Test User1'],
|
||||
cn=[u'Test User1'],
|
||||
initials=[u'TU'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
dn=u'uid=%s,cn=users,cn=accounts,%s' % (user1, api.env.basedn)
|
||||
),
|
||||
@ -150,6 +153,9 @@ class test_group(Declarative):
|
||||
sn=[u'User2'],
|
||||
uid=[user2],
|
||||
uidnumber=[fuzzy_digits],
|
||||
displayname=[u'Test User2'],
|
||||
cn=[u'Test User2'],
|
||||
initials=[u'TU'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
dn=u'uid=%s,cn=users,cn=accounts,%s' % (user2, api.env.basedn)
|
||||
),
|
||||
|
@ -207,6 +207,9 @@ class test_netgroup(Declarative):
|
||||
sn=[u'User1'],
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
displayname=[u'Test User1'],
|
||||
cn=[u'Test User1'],
|
||||
initials=[u'TU'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
dn=u'uid=%s,cn=users,cn=accounts,%s' % (user1, api.env.basedn),
|
||||
),
|
||||
@ -231,6 +234,9 @@ class test_netgroup(Declarative):
|
||||
sn=[u'User2'],
|
||||
uid=[user2],
|
||||
uidnumber=[fuzzy_digits],
|
||||
displayname=[u'Test User2'],
|
||||
cn=[u'Test User2'],
|
||||
initials=[u'TU'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
dn=u'uid=%s,cn=users,cn=accounts,%s' % (user2, api.env.basedn),
|
||||
),
|
||||
|
@ -93,6 +93,9 @@ class test_user(Declarative):
|
||||
sn=[u'User1'],
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
displayname=[u'Test User1'],
|
||||
cn=[u'Test User1'],
|
||||
initials=[u'TU'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
dn=u'uid=tuser1,cn=users,cn=accounts,' + api.env.basedn,
|
||||
),
|
||||
@ -156,6 +159,9 @@ class test_user(Declarative):
|
||||
'mepmanagedentry': [u'cn=%s,cn=groups,cn=accounts,%s' % (user1, api.env.basedn)],
|
||||
'krbpwdpolicyreference': [u'cn=global_policy,cn=%s,cn=kerberos,%s' % (api.env.realm, api.env.basedn)],
|
||||
'nsaccountlock': [u'False'],
|
||||
'displayname': [u'Test User1'],
|
||||
'cn': [u'Test User1'],
|
||||
'initials': [u'TU'],
|
||||
},
|
||||
],
|
||||
summary=u'1 user matched',
|
||||
@ -396,6 +402,9 @@ class test_user(Declarative):
|
||||
sn=[u'User1'],
|
||||
uid=[user1],
|
||||
uidnumber=[fuzzy_digits],
|
||||
displayname=[u'Test User1'],
|
||||
cn=[u'Test User1'],
|
||||
initials=[u'TU'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
dn=u'uid=tuser1,cn=users,cn=accounts,' + api.env.basedn,
|
||||
),
|
||||
@ -420,6 +429,9 @@ class test_user(Declarative):
|
||||
sn=[u'User2'],
|
||||
uid=[user2],
|
||||
uidnumber=[fuzzy_digits],
|
||||
displayname=[u'Test User2'],
|
||||
cn=[u'Test User2'],
|
||||
initials=[u'TU'],
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
dn=u'uid=tuser2,cn=users,cn=accounts,' + api.env.basedn,
|
||||
),
|
||||
|
Loading…
Reference in New Issue
Block a user