func-test: add default directory for zones

func-test/run_tests.py

 #!/usr/bin/env python3
 
 import argparse, importlib, os, re, sys, tempfile, time, traceback
-sys.path.append(os.path.dirname(os.path.realpath(__file__)) + "/tools")
+current_dir = os.path.dirname(os.path.realpath(__file__))
+sys.path.append(current_dir + "/tools")
 from dnstest import log, err
 import params
 
@@ -12,6 +13,7 @@ parser.add_argument("tests", metavar="[:]test[/case]", nargs="*", \
                     help="([exclude] | run) specific (test set | [test case])")
 args = parser.parse_args()
 
+params.common_data_dir = current_dir + "/tools/data/"
 outs_dir = tempfile.mkdtemp(prefix="knottest-%s-" % int(time.time()))
 tests_dir = "tests"
 test_cnt = 0

func-test/tests/ddns/add/data/example.com.zone

-$ORIGIN example.com.
-$TTL 3600
-
-@	SOA	dns1.example.com. hostmaster.example.com. (
-		2010111213	; serial
-		6h		; refresh
-		1h		; retry
-		1w		; expire
-		1d )		; minimum
-
-	NS	dns1
-	NS	dns2
-	MX	10 mail
-
-dns1	A	192.0.2.1
-	AAAA	2001:DB8::1
-
-dns2	A	192.0.2.2
-	AAAA	2001:DB8::2
-
-mail	A	192.0.2.3
-	AAAA	2001:DB8::3

func-test/tests/ddns/add/test.py

@@ -6,8 +6,8 @@ import dnstest
 
 t = dnstest.DnsTest()
 
-srv = t.server("bind")
-zone = t.zone("example.com.", "example.com.zone")
+srv = t.server("knot")
+zone = t.zone("example.com.")
 
 t.link(zone, srv, ddns=True)
 

func-test/tools/dnstest.py

@@ -926,17 +926,22 @@ class DnsTest(object):
         for server in self.servers:
             server._valgrind_check()
 
-    def zone(self, name, filename):
+    def zone(self, zone_name, file_name=None):
+        # Add trailing dot if missing.
+        if zone_name[-1] != ".":
+            zone_name += "."
+
         try:
-            src_file = self.data_dir + filename
-            dst_file = self.zones_dir + filename
+            if file_name:
+                src_file = self.data_dir + file_name
+                dst_file = self.zones_dir + file_name
+            else:
+                src_file = params.common_data_dir + zone_name + "zone"
+                dst_file = self.zones_dir + zone_name + "zone"
+
             shutil.copyfile(src_file, dst_file)
         except:
-            raise Exception("Can't use zone file %s" % filename)
-
-        zone_name = name
-        if zone_name[-1] != ".":
-            zone_name += "."
+            raise Exception("Can't use zone file %s" % src_file)
 
         return {zone_name: dst_file}
 

func-test/tools/params.py

@@ -5,6 +5,8 @@ This module allows interchanging of running parameters between modules.
 All variables are set automatically.
 '''
 
+# Common data directory.
+common_data_dir = ""
 # Current case relative directory.
 test_dir = ""
 # Current case absolute output directory.