From: Kees Monshouwer <mind04@monshouwer.org>
Date: Mon, 24 Feb 2014 13:11:00 +0000 (+0100)
Subject: add comment in travis.yml
X-Git-Tag: rec-3.6.0-rc1~169^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eb0c6e4fac87638de8bc59fdca8cb8552638c117;p=thirdparty%2Fpdns.git

add comment in travis.yml
---

diff --git a/.travis.yml b/.travis.yml
index 7b807c4be2..130b72c6a5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,19 +45,16 @@ script:
  - ./runtests recursor
  - cd ../regression-tests
  - touch tests/verify-dnssec-zone/allow-missing
+ - touch tests/verify-dnssec-zone/skip.optout # some (travis) tools in this test are unable to handle optout zones
  - ./start-test-stop 5300 bind-both
  - ./start-test-stop 5300 bind-dnssec-both
  - ./start-test-stop 5300 bind-dnssec-nsec3-both
- - touch tests/verify-dnssec-zone/skip
  - ./start-test-stop 5300 bind-dnssec-nsec3-optout-both
- - rm -f tests/verify-dnssec-zone/skip
  - ./start-test-stop 5300 bind-dnssec-nsec3-narrow
  - ./start-test-stop 5300 gmysql-nodnssec-both
  - ./start-test-stop 5300 gmysql-both
  - ./start-test-stop 5300 gmysql-nsec3-both
- - touch tests/verify-dnssec-zone/skip
  - ./start-test-stop 5300 gmysql-nsec3-optout-both
- - rm -f tests/verify-dnssec-zone/skip
  - ./start-test-stop 5300 gmysql-nsec3-narrow
  - ./start-test-stop 5300 gpgsql-nodnssec
  - ./start-test-stop 5300 gpgsql
diff --git a/regression-tests/backends/remote-master b/regression-tests/backends/remote-master
index 652a6a19d9..d270ab33b5 100644
--- a/regression-tests/backends/remote-master
+++ b/regression-tests/backends/remote-master
@@ -81,7 +81,7 @@ case $context in
 		# generate pdns.conf for pdnssec
 		cat > pdns-remote.conf <<EOF
 launch=remote
-remote-connection-string=$connstr
+remote-connection-string=$connstr,timeout=10000
 EOF
 
 		if [ "$remotedosec" = "yes" ]