From: Daniel Salzman <daniel.salzman@nic.cz>
Date: Thu, 26 Jun 2025 11:32:58 +0000 (+0200)
Subject: tests-extra: attempt to fix tls/quic xfr tests
X-Git-Tag: v3.5.0~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d10c345bf3674b7eb31a02b8fc8ecf9b01b1178a;p=thirdparty%2Fknot-dns.git

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 020a516793..293076cb5e 100644
--- a/tests-extra/tests/quic/xfr/test.py
+++ b/tests-extra/tests/quic/xfr/test.py
@@ -47,6 +47,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 55536d611d..ef777a35e6 100644
--- a/tests-extra/tests/tls/xfr/test.py
+++ b/tests-extra/tests/tls/xfr/test.py
@@ -99,7 +99,11 @@ try:
     else:
         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
@@ -125,7 +129,11 @@ try:
     else:
         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: