From b15807a4edc99faa2139249d36fe620f3f4eeb72 Mon Sep 17 00:00:00 2001
From: Martin Kosek <mkosek@redhat.com>
Date: Apr 17 2012 12:05:19 +0000
Subject: 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.

---

diff --git a/tests/test_xmlrpc/test_dns_plugin.py b/tests/test_xmlrpc/test_dns_plugin.py
index 661f87a..786c496 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 8ee682a..1da9d79 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'),
         ),