From b59a7e3ea72d38ddb8e06f687e9b81de951e02d7 Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Mon, 14 Sep 2015 11:39:05 +0300 Subject: [PATCH] Update test suite Now tests direct and indirect response. --- modules/geoipbackend/regression-tests/.gitignore | 3 +++ .../basic-a-resolution/expected_result | 3 +-- .../region-a-resolution/expected_result | 4 ---- .../regression-tests/region-cname-resolution/command | 2 ++ .../region-cname-resolution/description | 2 ++ regression-tests/backends/geoip-master | 12 ++++++++---- 6 files changed, 16 insertions(+), 10 deletions(-) delete mode 100644 modules/geoipbackend/regression-tests/region-a-resolution/expected_result create mode 100755 modules/geoipbackend/regression-tests/region-cname-resolution/command create mode 100644 modules/geoipbackend/regression-tests/region-cname-resolution/description diff --git a/modules/geoipbackend/regression-tests/.gitignore b/modules/geoipbackend/regression-tests/.gitignore index 638f32cb0..3684286cc 100644 --- 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 eef51b2f4..2f7a1041f 100644 --- 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 index dc3ff19c0..000000000 --- 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 index 000000000..8c2a917d1 --- /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 index 000000000..51497ac48 --- /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 fbaee6eff..7855543ac 100644 --- 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 < $testsdir/region-cname-resolution/expected_result < pdns-geoip.conf <