From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Tue, 2 Oct 2018 11:46:10 +0000 (+0200)
Subject: rec: Set allow-from-file in the configuration file in the tests
X-Git-Tag: dnsdist-1.3.3~79^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2c4e68807ca5bbe5487a2f71befcaeed9b36106c;p=thirdparty%2Fpdns.git

rec: Set allow-from-file in the configuration file in the tests

We can't override it via the API when it's set on the command line.
---

diff --git a/regression-tests.api/runtests.py b/regression-tests.api/runtests.py
index 6278815e6a..45145a6181 100755
--- a/regression-tests.api/runtests.py
+++ b/regression-tests.api/runtests.py
@@ -55,6 +55,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 +149,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.