Update test suite

Now tests direct and indirect response.

diff --git a/modules/geoipbackend/regression-tests/.gitignore b/modules/geoipbackend/regression-tests/.gitignore
index 638f32cb055fcf1d0e5eb6f63ddcd8ce864340b4..3684286cc5687789112cca04f04d499868c11999 100644 (file)
--- a/modules/geoipbackend/regression-tests/.gitignore
+++ b/modules/geoipbackend/regression-tests/.gitignore
@@ -2,3 +2,6 @@ diff
 real_result
 *.out
 geosec
+region-a-resolution/expected_result
+region-cname-resolution/expected_result
+geo.yaml

diff --git a/modules/geoipbackend/regression-tests/basic-a-resolution/expected_result b/modules/geoipbackend/regression-tests/basic-a-resolution/expected_result
index eef51b2f4eff9db2b4f21c74ebd01d3b02c04dfa..2f7a1041fcfdd56f64397c6c0721fb75cade673b 100644 (file)
--- a/modules/geoipbackend/regression-tests/basic-a-resolution/expected_result
+++ b/modules/geoipbackend/regression-tests/basic-a-resolution/expected_result
@@ -1,4 +1,3 @@
-0      unknown.service.geo.example.com.        IN      A       30      127.0.0.1
-0      www.geo.example.com.    IN      CNAME   30      unknown.service.geo.example.com.
+0      www.geo.example.com.    IN      A       30      127.0.0.1
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='www.geo.example.com.', qtype=A

diff --git a/modules/geoipbackend/regression-tests/region-a-resolution/expected_result b/modules/geoipbackend/regression-tests/region-a-resolution/expected_result
deleted file mode 100644 (file)
index dc3ff19..0000000
--- a/modules/geoipbackend/regression-tests/region-a-resolution/expected_result
+++ /dev/null
@@ -1,4 +0,0 @@
-0      oc.service.geo.example.com.     IN      A       30      62.236.200.4
-0      www.geo.example.com.    IN      CNAME   30      oc.service.geo.example.com.
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='www.geo.example.com.', qtype=A

diff --git a/modules/geoipbackend/regression-tests/region-cname-resolution/command b/modules/geoipbackend/regression-tests/region-cname-resolution/command
new file mode 100755 (executable)
index 0000000..8c2a917
--- /dev/null
+++ b/modules/geoipbackend/regression-tests/region-cname-resolution/command
@@ -0,0 +1,2 @@
+#!/bin/sh
+nameserver=$geoipregionip cleandig indirect.geo.example.com A

diff --git a/modules/geoipbackend/regression-tests/region-cname-resolution/description b/modules/geoipbackend/regression-tests/region-cname-resolution/description
new file mode 100644 (file)
index 0000000..51497ac
--- /dev/null
+++ b/modules/geoipbackend/regression-tests/region-cname-resolution/description
@@ -0,0 +1,2 @@
+This test tries to resolve a straight A record that is directly available in
+the database.

diff --git a/regression-tests/backends/geoip-master b/regression-tests/backends/geoip-master
index fbaee6effb202f464dab6eebda5b710e6ecb95f7..7855543ac025bed7c1267e6ad2b4907803fa1aed 100644 (file)
--- a/regression-tests/backends/geoip-master
+++ b/regression-tests/backends/geoip-master
@@ -43,14 +43,18 @@ domains:
       - a: 127.0.0.1
   services:
     www.geo.example.com: '%cn.service.geo.example.com'
+    indirect.geo.example.com: '%cn.elsewhere.example.com'
 EOF
                cat > $testsdir/region-a-resolution/expected_result <<EOF
-0      $geoipregion.service.geo.example.com.   IN      A       30      62.236.200.4
-0      www.geo.example.com.    IN      CNAME   30      $geoipregion.service.geo.example.com.
+0      www.geo.example.com.    IN      A       30      62.236.200.4
 Rcode: 0, 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.
+Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
+Reply to question for qname='indirect.geo.example.com.', qtype=A
+EOF
                # generate pdns.conf for pdnssec
                cat > pdns-geoip.conf <<EOF
 module-dir=./modules
@@ -68,7 +72,7 @@ EOF
                $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \
                        --no-shuffle --launch=geoip \
                        --cache-ttl=$cachettl --experimental-dname-processing --no-config \
-                       --send-root-referral --distributor-threads=1 \
+                       --distributor-threads=1 \
                         --geoip-zones-file=$testsdir/geo.yaml --module-dir=./modules \
                        $geoipkeydir &
                ;;