tests: improved blocking_txn not to fail and test better

tests-extra/tests/ctl/blocking_txn/test.py

@@ -61,10 +61,13 @@ if not BACKUP_FIRST:
     master.ctl("zone-begin " + ZONE)
 run_thr(background_backup, master, ZONE)
 if BACKUP_FIRST:
-    t.sleep(2.1)
-    master.zones_wait(zones)
+    t.sleep(2.05)
     try:
         master.ctl("zone-begin " + ZONE)
+        has_soa = master.ctl("zone-get " + ZONE + " " + ZONE + " SOA", availability=False, read_result=True)
+        if not " SOA " in has_soa:
+            master.ctl("zone-abort " + ZONE, availability=False)
+            raise Exception("restored and not yet loaded")
     except:
         t.sleep(1)
         master.zones_wait(zones)

tests-extra/tools/dnstest/server.py

@@ -383,7 +383,7 @@ class Server(object):
 
         self.binding_errors = errors
 
-    def ctl(self, cmd, wait=False, availability=True):
+    def ctl(self, cmd, wait=False, availability=True, read_result=False):
         if availability:
             # Check for listening control interface.
             ok = False
@@ -413,6 +413,10 @@ class Server(object):
         # Allow the command to complete, Bind needs this.
         self.wait_function(wait)
 
+        if read_result:
+            with open(self.dir + "/call.out", "r") as f:
+                return f.readlines()[-1]
+
     def reload(self):
         self.ctl("reload")
         time.sleep(Server.START_WAIT)