Merge pull request #7585 from rgacogne/dnsdist-zero-ttl

[thirdparty/pdns.git] / regression-tests.api / runtests.py

diff --git a/regression-tests.api/runtests.py b/regression-tests.api/runtests.py
index 9d2fb6c602992f5f3d66f0e769808f64ba76adc9..9263fcf19b7c7cccdd4568f3d477949ded1e2cfe 100755 (executable)
--- a/regression-tests.api/runtests.py
+++ b/regression-tests.api/runtests.py
@@ -11,6 +11,11 @@ import sys
 import tempfile
 import time
 
+try:
+  raw_input
+except NameError:
+  raw_input = input
+
 SQLITE_DB = 'pdns.sqlite3'
 WEBPORT = 5556
 DNSPORT = 5300
@@ -55,6 +60,7 @@ REC_CONF_TPL = """
 auth-zones=
 forward-zones=
 forward-zones-recurse=
+allow-from-file=acl.list
 api-config-dir=%(conf_dir)s
 include-dir=%(conf_dir)s
 """
@@ -148,7 +154,7 @@ else:
     with open(conf_dir+'/example.com..conf', 'w') as conf_file:
         conf_file.write(REC_EXAMPLE_COM_CONF_TPL)
 
-    servercmd = [pdns_recursor] + common_args + ["--allow-from-file=acl.list"]
+    servercmd = [pdns_recursor] + common_args
 
 
 # Now run pdns and the tests.
@@ -185,6 +191,8 @@ test_env.update({
     'DAEMON': daemon,
     'SQLITE_DB': SQLITE_DB,
     'PDNSUTIL_CMD': ' '.join(PDNSUTIL_CMD),
+    'SDIG': sdig,
+    'DNSPORT': str(DNSPORT)
 })
 
 try: