Skip to content

Commit

Permalink
Merge pull request #3968 from zeha/api-regress-bindlocal
Browse files Browse the repository at this point in the history
API: Bind daemons to 127.0.0.1 in regression tests
  • Loading branch information
Habbie authored Jun 9, 2016
2 parents ffe6043 + 33a05f9 commit 3d6753a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions regression-tests.api/runtests.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def ensure_empty_dir(name):
named_conf.write(AUTH_CONF_TPL)

subprocess.check_call(["../pdns/pdnsutil", "--config-dir=.", "secure-zone", "powerdnssec.org"])
pdnscmd = ("../pdns/pdns_server --daemon=no --local-port=5300 --socket-dir=./ --no-shuffle --dnsupdate=yes --cache-ttl=0 --config-dir=. --api=yes --webserver=yes --webserver-port="+WEBPORT+" --webserver-address=127.0.0.1 --webserver-password=something --api-key="+APIKEY).split()
pdnscmd = ("../pdns/pdns_server --daemon=no --local-address=127.0.0.1 --local-port=5300 --socket-dir=./ --no-shuffle --dnsupdate=yes --cache-ttl=0 --config-dir=. --api=yes --webserver=yes --webserver-port="+WEBPORT+" --webserver-address=127.0.0.1 --webserver-password=something --api-key="+APIKEY).split()

else:
conf_dir = 'rec-conf.d'
Expand All @@ -112,7 +112,7 @@ def ensure_empty_dir(name):
with open(conf_dir+'/example.com..conf', 'w') as conf_file:
conf_file.write(REC_EXAMPLE_COM_CONF_TPL)

pdnscmd = (pdns_recursor + " --daemon=no --socket-dir=. --config-dir=. --allow-from-file=acl.list --local-port=5555 --webserver=yes --webserver-port="+WEBPORT+" --webserver-address=127.0.0.1 --webserver-password=something --api-key="+APIKEY).split()
pdnscmd = (pdns_recursor + " --daemon=no --socket-dir=. --config-dir=. --allow-from-file=acl.list --local-address=127.0.0.1 --local-port=5555 --webserver=yes --webserver-port="+WEBPORT+" --webserver-address=127.0.0.1 --webserver-password=something --api-key="+APIKEY).split()


# Now run pdns and the tests.
Expand Down

0 comments on commit 3d6753a

Please sign in to comment.