summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Kosek <mkosek@redhat.com>2012-04-17 10:26:20 +0200
committerMartin Kosek <mkosek@redhat.com>2012-04-17 14:05:19 +0200
commitb15807a4edc99faa2139249d36fe620f3f4eeb72 (patch)
treec5b4059e10a561fab50444e1f27480f727d98024
parentd4350c05badd20f69de5d782850cd26b9128889a (diff)
downloadfreeipa.git-b15807a4edc99faa2139249d36fe620f3f4eeb72.tar.gz
freeipa.git-b15807a4edc99faa2139249d36fe620f3f4eeb72.tar.xz
freeipa.git-b15807a4edc99faa2139249d36fe620f3f4eeb72.zip
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.
-rw-r--r--tests/test_xmlrpc/test_dns_plugin.py4
-rw-r--r--tests/test_xmlrpc/test_permission_plugin.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/test_xmlrpc/test_dns_plugin.py b/tests/test_xmlrpc/test_dns_plugin.py
index 661f87ad..786c4961 100644
--- a/tests/test_xmlrpc/test_dns_plugin.py
+++ b/tests/test_xmlrpc/test_dns_plugin.py
@@ -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"],
diff --git a/tests/test_xmlrpc/test_permission_plugin.py b/tests/test_xmlrpc/test_permission_plugin.py
index 8ee682a5..1da9d795 100644
--- a/tests/test_xmlrpc/test_permission_plugin.py
+++ b/tests/test_xmlrpc/test_permission_plugin.py
@@ -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'),
),