Re: [Freeipa-devel] [PATCH 0139] DNS: Fix tests for realm domains integration with DNS zone ad

2016-06-28 Thread Martin Basti 



On 28.06.2016 12:12, David Kupka wrote:

On 27/06/16 11:48, Petr Spacek wrote:

Hello,

DNS: Fix tests for realm domains integration with DNS zone add

We forgot to update tests after change in
22f4045f72daf182c44ce574291c0d8a7733713b.

https://fedorahosted.org/freeipa/ticket/5980


It should go to master, 4-3, and 4-2 as well (as the original change).



idnsforwarders needs to be changed on both occurrences. Fixed patch 
attached. Petr^2 approved the change. Attached version works as 
expected and the test is green again, ACK.





Pushed to:
master: bf91c0f938502fdd9ac6490d0781788ec99a868b
ipa-4-3: ae3b905ecb5fe3c1e2b46aeee9ed66fa03337f9b
ipa-4-2: 864cc6994b2b4abc775be88864b706e6386be3f2

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

Re: [Freeipa-devel] [PATCH 0139] DNS: Fix tests for realm domains integration with DNS zone ad

2016-06-28 Thread David Kupka 

On 27/06/16 11:48, Petr Spacek wrote:

Hello,

DNS: Fix tests for realm domains integration with DNS zone add

We forgot to update tests after change in
22f4045f72daf182c44ce574291c0d8a7733713b.

https://fedorahosted.org/freeipa/ticket/5980


It should go to master, 4-3, and 4-2 as well (as the original change).



idnsforwarders needs to be changed on both occurrences. Fixed patch 
attached. Petr^2 approved the change. Attached version works as expected 
and the test is green again, ACK.


--
David Kupka
From c33e67cdfae7cf03a638fc27a69fa8cc39fc4301 Mon Sep 17 00:00:00 2001
From: Petr Spacek 
Date: Mon, 27 Jun 2016 11:46:09 +0200
Subject: [PATCH] DNS: Fix tests for realm domains integration with DNS zone
 add

We forgot to update tests after change in
22f4045f72daf182c44ce574291c0d8a7733713b.

https://fedorahosted.org/freeipa/ticket/5980
---
 ipatests/test_xmlrpc/test_dns_realmdomains_integration.py | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ipatests/test_xmlrpc/test_dns_realmdomains_integration.py b/ipatests/test_xmlrpc/test_dns_realmdomains_integration.py
index 9482ef6abf24d87f28447b1219f628662617528b..4b244e0cbba9eede6718d3497d6635d497127aa3 100644
--- a/ipatests/test_xmlrpc/test_dns_realmdomains_integration.py
+++ b/ipatests/test_xmlrpc/test_dns_realmdomains_integration.py
@@ -135,12 +135,12 @@ class test_dns_realmdomains_integration(Declarative):
 ),
 
 dict(
-desc='Check realmdomain and TXT record do not get created '
- 'during dnszone_add for forwarded zone',
+desc='Check realmdomain and TXT record gets created '
+ 'during dnszone_add for master zone with a forwarder',
 command=(
 'dnszone_add', [dnszone_2], {
 'idnssoarname': idnssoarname,
-'idnsforwarders': u'1.2.3.4',
+'idnsforwarders': u'198.18.19.20',
 'idnsforwardpolicy': u'only',
 }
 ),
@@ -162,7 +162,7 @@ class test_dns_realmdomains_integration(Declarative):
 'idnsname': [DNSName(dnszone_2_absolute)],
 'idnszoneactive': [u'TRUE'],
 'idnssoamname': [self_server_ns_dnsname],
-'idnsforwarders': [u'1.2.3.4'],
+'idnsforwarders': [u'198.18.19.20'],
 'idnsforwardpolicy': [u'only'],
 'nsrecord': lambda x: True,
 'idnssoarname': [DNSName(idnssoarname)],
@@ -182,7 +182,7 @@ class test_dns_realmdomains_integration(Declarative):
 
 },
 },
-extra_check=assert_realmdomain_and_txt_record_not_present,
+extra_check=assert_realmdomain_and_txt_record_present,
 ),
 
 dict(
-- 
2.7.4

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

[Freeipa-devel] [PATCH 0139] DNS: Fix tests for realm domains integration with DNS zone ad

2016-06-27 Thread Petr Spacek 
Hello,

DNS: Fix tests for realm domains integration with DNS zone add

We forgot to update tests after change in
22f4045f72daf182c44ce574291c0d8a7733713b.

https://fedorahosted.org/freeipa/ticket/5980


It should go to master, 4-3, and 4-2 as well (as the original change).

-- 
Petr^2 Spacek
From 0c0620eca56434f54bd6c1b4b04768d4dcb5abe7 Mon Sep 17 00:00:00 2001
From: Petr Spacek 
Date: Mon, 27 Jun 2016 11:46:09 +0200
Subject: [PATCH] DNS: Fix tests for realm domains integration with DNS zone
 add

We forgot to update tests after change in
22f4045f72daf182c44ce574291c0d8a7733713b.

https://fedorahosted.org/freeipa/ticket/5980
---
 ipatests/test_xmlrpc/test_dns_realmdomains_integration.py | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ipatests/test_xmlrpc/test_dns_realmdomains_integration.py b/ipatests/test_xmlrpc/test_dns_realmdomains_integration.py
index 9482ef6abf24d87f28447b1219f628662617528b..4b3b5666d8d8c5c4ac7a001008e87c88621d63b9 100644
--- a/ipatests/test_xmlrpc/test_dns_realmdomains_integration.py
+++ b/ipatests/test_xmlrpc/test_dns_realmdomains_integration.py
@@ -135,12 +135,12 @@ class test_dns_realmdomains_integration(Declarative):
 ),
 
 dict(
-desc='Check realmdomain and TXT record do not get created '
- 'during dnszone_add for forwarded zone',
+desc='Check realmdomain and TXT record gets created '
+ 'during dnszone_add for master zone with a forwarder',
 command=(
 'dnszone_add', [dnszone_2], {
 'idnssoarname': idnssoarname,
-'idnsforwarders': u'1.2.3.4',
+'idnsforwarders': u'198.18.19.20',
 'idnsforwardpolicy': u'only',
 }
 ),
@@ -182,7 +182,7 @@ class test_dns_realmdomains_integration(Declarative):
 
 },
 },
-extra_check=assert_realmdomain_and_txt_record_not_present,
+extra_check=assert_realmdomain_and_txt_record_present,
 ),
 
 dict(
-- 
2.7.4

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code