From: Aki Tuomi <cmouse@cmouse.fi>
Date: Fri, 27 Nov 2015 10:27:21 +0000 (+0200)
Subject: Update test suite
X-Git-Tag: dnsdist-1.0.0-alpha1~172^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47f1ce7e551547b7cf73ca4aa1934374fcecf50e;p=thirdparty%2Fpdns.git

Update test suite
---

diff --git a/modules/geoipbackend/regression-tests/region-a-resolution/command b/modules/geoipbackend/regression-tests/region-a-resolution/command
index 432a2e9aae..de4402b582 100755
--- a/modules/geoipbackend/regression-tests/region-a-resolution/command
+++ b/modules/geoipbackend/regression-tests/region-a-resolution/command
@@ -1,2 +1,2 @@
 #!/bin/sh
-nameserver=$geoipregionip cleandig www.geo.example.com A
+cleandig www.geo.example.com A ednssubnet 1.2.3.4/32
diff --git a/modules/geoipbackend/regression-tests/region-cname-resolution/command b/modules/geoipbackend/regression-tests/region-cname-resolution/command
index 8c2a917d1c..323ac16c29 100755
--- a/modules/geoipbackend/regression-tests/region-cname-resolution/command
+++ b/modules/geoipbackend/regression-tests/region-cname-resolution/command
@@ -1,2 +1,2 @@
 #!/bin/sh
-nameserver=$geoipregionip cleandig indirect.geo.example.com A
+cleandig indirect.geo.example.com A ednssubnet 1.2.3.4/32
diff --git a/modules/geoipbackend/regression-tests/text-interpolation/command b/modules/geoipbackend/regression-tests/text-interpolation/command
index a855e0f18a..f0b15ee21b 100755
--- a/modules/geoipbackend/regression-tests/text-interpolation/command
+++ b/modules/geoipbackend/regression-tests/text-interpolation/command
@@ -1,2 +1,2 @@
 #!/bin/sh
-nameserver=$geoipregionip cleandig country.geo.example.com TXT
+cleandig continent.geo.example.com TXT ednssubnet 1.2.3.4/32
diff --git a/regression-tests/backends/geoip-master b/regression-tests/backends/geoip-master
index c40674a8c9..9a5599ab19 100644
--- a/regression-tests/backends/geoip-master
+++ b/regression-tests/backends/geoip-master
@@ -49,13 +49,21 @@ domains:
 EOF
 		cat > $testsdir/region-a-resolution/expected_result <<EOF
 0	www.geo.example.com.	IN	A	30	62.236.200.4
+2	.	IN	OPT	0	AAgACAABIBgBAgME
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='www.geo.example.com.', qtype=A
 EOF
                 cat > $testsdir/region-cname-resolution/expected_result <<EOF
 0	indirect.geo.example.com.	IN	CNAME	30	$geoipregion.elsewhere.example.com.
+2	.	IN	OPT	0	AAgACAABIBgBAgME
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='indirect.geo.example.com.', qtype=A
+EOF
+                cat > $testsdir/text-interpolation/expected_result <<EOF
+0	continent.geo.example.com.	IN	TXT	30	"Your continent is $geoipregion"
+2	.	IN	OPT	0	AAgACAABIBgBAgME
+Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
+Reply to question for qname='continent.geo.example.com.', qtype=TXT
 EOF
 		# generate pdns.conf for pdnssec
 		cat > pdns-geoip.conf <<EOF