Fix DNS and permissions unit tests

Amend unit tests to match the latest changes in DNS (tickets 2627,
2628) and hardened exception error message checks.
This commit is contained in:
Martin Kosek 2012-04-17 10:26:20 +02:00
parent 9c39f95f21
commit c79ea41a80
2 changed files with 3 additions and 3 deletions

View File

@ -616,7 +616,7 @@ class test_dns(Declarative):
'result': {
'objectclass': [u'top', u'idnsrecord', u'idnszone'],
'dn': unicode(dnszone1_dn),
'idnsname': [dnszone1],
'idnsname': [u'@'],
'mxrecord': [u"0 %s" % dnszone1_mname],
'nsrecord': [dnszone1_mname],
},
@ -721,7 +721,7 @@ class test_dns(Declarative):
'result': {
'objectclass': [u'top', u'idnsrecord', u'idnszone'],
'dn': unicode(dnszone1_dn),
'idnsname': [dnszone1],
'idnsname': [u'@'],
'mxrecord': [u"0 %s" % dnszone1_mname],
'nsrecord': [dnszone1_mname],
'locrecord': [u"49 11 42.400 N 16 36 29.600 E 227.64"],

View File

@ -475,7 +475,7 @@ class test_permission(Declarative):
'permission_mod', [permission1], dict(rename=u'',
permissions=u'all',)
),
expected=errors.ValidationError(name=u'rename',
expected=errors.ValidationError(name='rename',
error=u'New name can not be empty'),
),