IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix DNS record rename test

Browse Source 
bind-dyndb-ldap's bug caused test failure
https://fedorahosted.org/bind-dyndb-ldap/ticket/123

Owners with NS record works with the bug

Reviewed-By: Petr Spacek <pspacek@redhat.com>
Reviewed-By: Martin Kosek <mkosek@redhat.com>
This commit is contained in:
Martin Basti 2014-08-21 19:11:27 +02:00 committed by Martin Kosek
parent c7dc1b508c
commit a32736320a
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ipatests/test_xmlrpc/test_dns_plugin.py
View File

@ -120,12 +120,12 @@ revzone3_classless2_permission_dn = DN(('cn', revzone3_classless2_permission),
name1 = u'testdnsres' name1 = u'testdnsres'
name1_dnsname = DNSName(name1) name1_dnsname = DNSName(name1)
name1_dn = DN(('idnsname',name1), zone1_dn) name1_dn = DN(('idnsname',name1), zone1_dn)
name1_renamed = u'testdnsres-renamed'
name1_renamed_dnsname = DNSName(name1_renamed)
name_ns = u'testdnsres-ns' name_ns = u'testdnsres-ns'
name_ns_dnsname = DNSName(name_ns) name_ns_dnsname = DNSName(name_ns)
name_ns_dn = DN(('idnsname',name_ns), zone1_dn) name_ns_dn = DN(('idnsname',name_ns), zone1_dn)
name_ns_renamed = u'testdnsres-ns-renamed'
name_ns_renamed_dnsname = DNSName(name_ns_renamed)
revname1 = u'80' revname1 = u'80'
revname1_dnsname = DNSName(revname1) revname1_dnsname = DNSName(revname1)
@ -1173,7 +1173,7 @@ class test_dns(Declarative):
expected=errors.ValidationError(name='nsrecord', expected=errors.ValidationError(name='nsrecord',
error=u'NS record is not allowed to coexist with an DNAME ' error=u'NS record is not allowed to coexist with an DNAME '
u'record except when located in a zone root record ' u'record except when located in a zone root record '
'(RFC 2181, section 6.1'), '(RFC 2181, section 6.1)'),
), ),
dict( dict(
@ -1278,34 +1278,33 @@ class test_dns(Declarative):
dict( dict(
desc='Try to to rename DNS zone %r root record' % (zone1), desc='Try to to rename DNS zone %r root record' % (zone1),
command=('dnsrecord_mod', [zone1, u'@'], {'rename': name1_renamed,}), command=('dnsrecord_mod', [zone1, u'@'], {'rename': u'renamed-zone',}),
expected=errors.ValidationError(name='rename', expected=errors.ValidationError(name='rename',
error=u'DNS zone root record cannot be renamed') error=u'DNS zone root record cannot be renamed')
), ),
dict( dict(
desc='Rename DNS record %r to %r' % (name1, name1_renamed), desc='Rename DNS record %r to %r' % (name_ns, name_ns_renamed),
command=('dnsrecord_mod', [zone1, name1], {'rename': name1_renamed,}), command=('dnsrecord_mod', [zone1, name_ns], {'rename': name_ns_renamed,}),
expected={ expected={
'value': name1_dnsname, 'value': name_ns_dnsname,
'summary': None, 'summary': None,
'result': { 'result': {
'idnsname': [name1_renamed_dnsname], 'idnsname': [name_ns_renamed_dnsname],
'arecord': [arec3], 'nsrecord': [absnxname],
'kxrecord': [u'1 foo-1'],
'txtrecord': [u'foo bar'],
}, },
}, },
), ),
dict( dict(
desc='Delete record %r in zone %r' % (name1_renamed, zone1), desc='Delete record %r in zone %r' % (name1, zone1),
command=('dnsrecord_del', [zone1, name1_renamed], command=('dnsrecord_del', [zone1, name1],
{'del_all': True}), {'del_all': True}),
expected={ expected={
'value': [name1_renamed_dnsname], 'value': [name1_dnsname],
'summary': u'Deleted record "%s"' % name1_renamed, 'summary': u'Deleted record "%s"' % name1,
'result': {'failed': []}, 'result': {'failed': []},
}, },
), ),