geoipbackend: Add test for apex record and service mixing

diff --git a/modules/geoipbackend/regression-tests/apex-record/command b/modules/geoipbackend/regression-tests/apex-record/command
new file mode 100755 (executable)
index 0000000..1f8dee5
--- /dev/null
+++ b/modules/geoipbackend/regression-tests/apex-record/command
@@ -0,0 +1,3 @@
+#!/bin/sh
+cleandig geo.example.com A
+

diff --git a/modules/geoipbackend/regression-tests/apex-record/description b/modules/geoipbackend/regression-tests/apex-record/description
new file mode 100644 (file)
index 0000000..b1ecc21
--- /dev/null
+++ b/modules/geoipbackend/regression-tests/apex-record/description
@@ -0,0 +1 @@
+This test checks that you can have a apex record as both service record and static record.

diff --git a/modules/geoipbackend/regression-tests/apex-record/expected_result b/modules/geoipbackend/regression-tests/apex-record/expected_result
new file mode 100644 (file)
index 0000000..b1cfab9
--- /dev/null
+++ b/modules/geoipbackend/regression-tests/apex-record/expected_result
@@ -0,0 +1,3 @@
+0      geo.example.com.        IN      A       30      127.0.0.1
+Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
+Reply to question for qname='geo.example.com.', qtype=A

diff --git a/modules/geoipbackend/regression-tests/static-any-resolution/expected_result b/modules/geoipbackend/regression-tests/static-any-resolution/expected_result
index 967e069c12aa6a208e63cd213877b783e361ba2f..d7847b96428e0dbe950bf6c80356c42bf769c206 100644 (file)
--- a/modules/geoipbackend/regression-tests/static-any-resolution/expected_result
+++ b/modules/geoipbackend/regression-tests/static-any-resolution/expected_result
@@ -1,3 +1,4 @@
+0      geo.example.com.        IN      A       30      127.0.0.1
 0      geo.example.com.        IN      MX      30      10 mx.example.com.
 0      geo.example.com.        IN      NS      30      ns1.example.com.
 0      geo.example.com.        IN      NS      30      ns2.example.com.

diff --git a/regression-tests/backends/geoip-master b/regression-tests/backends/geoip-master
index 0397e138cf51767644353ba2e9034323775d7a40..72ea6416ae22aa8bcbc31060ae02ca307a181fd0 100644 (file)
--- a/regression-tests/backends/geoip-master
+++ b/regression-tests/backends/geoip-master
@@ -45,6 +45,7 @@ domains:
     unknown.service.geo.example.com:
       - a: 127.0.0.1
   services:
+    geo.example.com: '%cn.service.geo.example.com'
     www.geo.example.com: '%cn.service.geo.example.com'
     indirect.geo.example.com: '%cn.elsewhere.example.com'
     city.geo.example.com: '%ci.%re.%cc.city.geo.example.com'