tests-extra: attempt to fix tls/quic xfr tests

diff --git a/tests-extra/tests/quic/xfr/test.py b/tests-extra/tests/quic/xfr/test.py
index f61fae1aff2376c38d642cfffbbeacadfaa74d21..674493cf93ae71420c025f979d851289f0400a56 100644 (file)
--- a/tests-extra/tests/quic/xfr/test.py
+++ b/tests-extra/tests/quic/xfr/test.py
@@ -48,6 +48,9 @@ def check_error(server, msg):
 def upd_check_zones(master, slave, zones, prev_serials):
     for z in rnd_zones:
         master.random_ddns(z, allow_empty=False)
+    if master.valgrind: # Should fix unstability under Valgrind
+        t.sleep(1)
+        master.ctl("zone-notify")
     serials = slave.zones_wait(zones, prev_serials)
     t.xfr_diff(master, slave, zones, prev_serials)
     return serials

diff --git a/tests-extra/tests/tls/xfr/test.py b/tests-extra/tests/tls/xfr/test.py
index ba986587fd37581f628098347d2bf4c4334c614c..9df909ff2a667aa148faff152d17c804983d4418 100644 (file)
--- a/tests-extra/tests/tls/xfr/test.py
+++ b/tests-extra/tests/tls/xfr/test.py
@@ -85,7 +85,11 @@ try:
     # Check IXFR with cert-key-based authenticated master
     master.fill_cert_key()
     slave.gen_confile()
-    slave.reload()
+    if slave.valgrind: # For unknown reason reload is unstable with ASAN
+        slave.reload()
+    else:
+        slave.stop()
+        slave.start()
     serials = upd_check_zones(master, slave, rnd_zones, serials)
 
     # Check slave not authenticated due to bad cert-key
@@ -101,7 +105,11 @@ try:
     # Check IXFR with cert-key-based authenticated slave
     slave.fill_cert_key()
     master.gen_confile()
-    master.reload()
+    if master.valgrind: # For unknown reason reload is unstable with ASAN
+        master.reload()
+    else:
+        master.stop()
+        master.start()
     serials = upd_check_zones(master, slave, rnd_zones, serials)
 
 finally: