From c4a971f2194c633c10b1c8bad661a94a13e183a7 Mon Sep 17 00:00:00 2001
From: Petr Spacek <pspacek@redhat.com>
Date: Fri, 12 Aug 2016 19:49:33 +0200
Subject: [PATCH 1/2] Tests: fix test_forward_zones in
 test_xmlrpc/test_dns_plugin

Class test_forward_zones in ipatests/test_xmlrpc/test_dns_plugin
was using DNS zone 'fwzone2.test.' and expected to get warning
'Forwarding policy conflicts with some automatic empty zones.'
(aka 'DNSForwardPolicyConflictWithEmptyZone').

This does not make sense because 'test.' zone is not listed in IANA registry
'Locally-Served DNS Zones':
http://www.iana.org/assignments/locally-served-dns-zones/locally-served-dns-zones.xhtml

To fix this I simply removed the warning from set of expected results.

https://fedorahosted.org/freeipa/ticket/6213
---
 ipatests/test_xmlrpc/test_dns_plugin.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/ipatests/test_xmlrpc/test_dns_plugin.py b/ipatests/test_xmlrpc/test_dns_plugin.py
index aa011ce..196aa0c 100644
--- a/ipatests/test_xmlrpc/test_dns_plugin.py
+++ b/ipatests/test_xmlrpc/test_dns_plugin.py
@@ -3444,15 +3444,7 @@ def setup_class(cls):
             expected={
                 'value': fwzone2_dnsname,
                 'summary': None,
-                u'messages': (
-                    {u'message': lambda x: x.startswith(
-                        u"Forwarding policy conflicts with some "
-                        "automatic empty zones."),
-                     u'code': 13021,
-                     u'type': u'warning',
-                     u'name': u'DNSForwardPolicyConflictWithEmptyZone',
-                     u'data': {}},
-                    {u'message': lambda x: x.startswith(
+                u'messages': ({u'message': lambda x: x.startswith(
                         u"DNS server %s: query '%s SOA':" %
                         (forwarder1, fwzone2)),
                      u'code': 13006,

From f0c54768c0219d7faab6056ea5d911ef730bd5e2 Mon Sep 17 00:00:00 2001
From: Petr Spacek <pspacek@redhat.com>
Date: Mon, 29 Aug 2016 16:30:49 +0200
Subject: [PATCH 2/2] Tests: fix test_forward_zones in
 test_xmlrpc/test_dns_plugin

Class test_forward_zones in ipatests/test_xmlrpc/test_dns_plugin
had server IP and zone name interchanged in "expected" dictionart.

I do not understand how this happened.

https://fedorahosted.org/freeipa/ticket/6213
---
 ipatests/test_xmlrpc/test_dns_plugin.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ipatests/test_xmlrpc/test_dns_plugin.py b/ipatests/test_xmlrpc/test_dns_plugin.py
index 196aa0c..a02b4a9 100644
--- a/ipatests/test_xmlrpc/test_dns_plugin.py
+++ b/ipatests/test_xmlrpc/test_dns_plugin.py
@@ -3452,8 +3452,8 @@ def setup_class(cls):
                      u'name': u'DNSServerValidationWarning',
                      u'data': {
                         u'error': lambda x: x.startswith(
-                            u"query '%s SOA':" % forwarder1),
-                        u'server': u"%s" % fwzone2
+                            u"query '%s SOA':" % fwzone2),
+                        u'server': u"%s" % forwarder1
                      }},
                 ),
                 'result': {