add comment in travis.yml

diff --git a/.travis.yml b/.travis.yml
index 7b807c4be2a852edac1a20f3ecaaa852a2d003b2..130b72c6a53ac6da3e5bd89240203af05fa99f36 100644 (file)
--- 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 652a6a19d9a12b8a69c221eef76cf3da1dc47075..d270ab33b5173fc5c59ca4c4bf50e947ee7cb75e 100644 (file)
--- 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" ]