Update test suite

diff --git a/modules/geoipbackend/regression-tests/region-a-resolution/command b/modules/geoipbackend/regression-tests/region-a-resolution/command
index 432a2e9aae27776291bd084bb4468b1319b43bac..de4402b582b3833b4d3a69b0b105eeb252bc1c17 100755 (executable)
--- 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 8c2a917d1ced3288cd9695a0592c1d566bc3459e..323ac16c296a0d6522e082c537ace924e8f56331 100755 (executable)
--- 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 a855e0f18a6ad16502a3dc17efd0f0b642ed6a52..f0b15ee21bde851d05981d76574f26d53d9f19f4 100755 (executable)
--- 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 c40674a8c956d88542a435d28485510f0a29af49..9a5599ab19372de4a2d0e68ecaeb4c7d8641084c 100644 (file)
--- 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