From: Aki Tuomi <cmouse@desteem.org>
Date: Wed, 18 Nov 2015 15:17:46 +0000 (+0200)
Subject: Update tests
X-Git-Tag: dnsdist-1.0.0-alpha1~210^2~4^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08008ec7a1744c5eab3b86ed457abfb310ac3fad;p=thirdparty%2Fpdns.git

Update tests
---

diff --git a/.travis.yml b/.travis.yml
index 2642919155..0c3407ddf1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -144,7 +144,7 @@ script:
  - touch tests/verify-dnssec-zone/allow-missing
  - touch tests/verify-dnssec-zone/skip.nsec3 # some (travis) tools in this test are unable to handle nsec3 zones
  - touch tests/verify-dnssec-zone/skip.optout
- - export geoipregion=aus geoipregionip=1.2.3.4
+ - export geoipregion=oc geoipregionip=1.2.3.4
  - ./timestamp ./start-test-stop 5300 bind-both
  - ./timestamp ./start-test-stop 5300 bind-dnssec-both
  - ./timestamp ./start-test-stop 5300 bind-dnssec-pkcs11
diff --git a/regression-tests/backends/geoip-master b/regression-tests/backends/geoip-master
index cd8b6df824..c59e487fab 100644
--- a/regression-tests/backends/geoip-master
+++ b/regression-tests/backends/geoip-master
@@ -60,6 +60,7 @@ EOF
 module-dir=./modules
 launch=geoip
 geoip-zones-file=$testsdir/geo.yaml
+geoip-database-files=/usr/share/GeoIP/GeoIP.dat
 EOF
 
 		if [ "$geoipdosec" = "yes" ]
@@ -73,7 +74,8 @@ EOF
 			--no-shuffle --launch=geoip \
 			--cache-ttl=$cachettl --experimental-dname-processing --no-config \
 			--distributor-threads=1 \
-                        --geoip-zones-file=$testsdir/geo.yaml --module-dir=./modules \
+                        --geoip-zones-file=$testsdir/geo.yaml --geoip-database-files=/usr/share/GeoIP/GeoIP.dat \
+                        --module-dir=./modules \
 			$geoipkeydir &
 		;;