tests-extra: fix zone file updating

tests-extra/tools/dnstest/server.py

@@ -660,7 +660,8 @@ class Server(object):
         if random:
             self.zones[zone.name].zfile.update_rnd()
         else:
-            self.zones[zone.name].zfile.upd_file(version=version)
+            self.zones[zone.name].zfile.upd_file(storage=self.data_dir,
+                                                 version=version)
 
     def add_query_module(self, zone, module, param):
         # Convert one item list to single object.

tests-extra/tools/dnstest/zonefile.py

@@ -46,9 +46,10 @@ class ZoneFile(object):
 
         if not file_name:
             file_name = self.name + "zone"
-
         self.file_name = os.path.basename(file_name)
-        self.storage = storage if storage else os.path.dirname(file_name)
+
+        if not self.storage:
+            self.storage = storage if storage else os.path.dirname(file_name)
 
         if not exists:
             return