]> git.ipfire.org Git - thirdparty/knot-dns.git/commitdiff
tests: fix fail with slow semcheck of DNSSEC with valgrind
authorLibor Peltan <libor.peltan@nic.cz>
Wed, 8 Jun 2022 17:55:23 +0000 (19:55 +0200)
committerLibor Peltan <libor.peltan@nic.cz>
Wed, 8 Jun 2022 17:56:41 +0000 (19:56 +0200)
tests-extra/tests/basic/nsec3/test.py
tests-extra/tests/catalog/rapid_updates/test.py
tests-extra/tests/ixfr/knot_knot/test.py
tests-extra/tests/modules/dnsproxy/test.py
tests-extra/tests/modules/stats/test.py
tests-extra/tests/zone/backup/test.py
tests-extra/tests/zone/backup_lock/test.py
tests-extra/tests/zone/flush_immediate/test.py

index 8a304a32b5aef9d12788be8e6ab5057d28ef27d7..0dd1be56b3d271641b27475de5efb9dbe7312bb2 100644 (file)
@@ -16,6 +16,8 @@ t.link(zone, knot)
 t.link(zone, bind)
 
 t.start()
+knot.zone_wait(zone)
+bind.zone_wait(zone)
 
 # B1. Answer.
 resp = knot.dig("x.w.example", "MX", dnssec=True)
index 35c6455be62a94e679c4b8b771bfa1ebf73495e4..ff44f9479f12f68850dff0914563912003f10eb8 100644 (file)
@@ -18,6 +18,9 @@ t = Test(stress=False)
 
 knot = t.server("knot")
 
+if knot.valgrind:
+    knot.semantic_check = False
+
 catz = t.zone("catalog1.", storage=".")
 
 t.link(catz, knot)
index ee9ec0e92bd6a34790f54e1b9a66d860780bbb2a..22086e4e9cdc17f904a3023e22a6ddbfebfa6b98 100644 (file)
@@ -12,6 +12,10 @@ zones = t.zone_rnd(5, records=50) + t.zone("records.")
 
 t.link(zones, master, slave, ixfr=True)
 
+if master.valgrind:
+    master.semantic_check = False
+    slave.semantic_check = False
+
 master.tcp_io_timeout = 3000
 slave.tcp_io_timeout = 3000
 slave.tcp_remote_io_timeout = 8000
index 3d6f4287efc65b45c715ee0a201c165ad26ab807..fa506c133a5b148dde37d2e0c3e4fb62d3c4f558 100644 (file)
@@ -24,6 +24,10 @@ remote = t.server("knot")
 t.link(zone_common2, remote)
 t.link(zone_remote, remote)
 
+if local.valgrind:
+    local.semantic_check = False
+    remote.semantic_check = False
+
 def is_subzone(subzone, zone):
     """Tests if the first zone is a subzone of the second one or equal, case insensitive."""
     return subzone.name.lower().endswith(zone.name.lower())
index 9b9986366ee048039a188d78666e27e2048243ae..c800f69a5743e86bf3be0d50196435555302a9c6 100644 (file)
@@ -58,7 +58,7 @@ knot.add_module(zones[0], ModStats())
 knot.add_module(zones[1], ModStats())
 
 t.start()
-t.sleep(4)
+t.zones_wait(zones)
 
 check_item(knot, "server", "zone-count", 2)
 
index a8acf1e24cc1eca2edf22504290606dc060ea9a6..b96383bca13be5df3dd93506933f00b5218806fe 100644 (file)
@@ -43,6 +43,10 @@ zone0_expire = 45   # zone zones[0] expiration time in its SOA
 valgrind_delay = 2 if slave.valgrind else 0  # allow a little time margin under Valgrind
 valgrind_delay += 2 # even without valgrind, add some tolerance because rounding timestamps to whole seconds multiple times
 
+if master.valgrind:
+    master.semantic_check = False
+    slave.semantic_check = False
+
 t.start()
 serials_init = slave.zones_wait(zones)
 start_time = int(t.uptime())
index 15c4e8c9f1407a209c760d305d8c2ec2def0f059..1aab2b5507bf4fb3eb717931c4ef8a9d15aadfe7 100644 (file)
@@ -59,6 +59,10 @@ if master.valgrind:
 lockfile = os.path.join(backup_dir, "lock.knot_backup")
 labelfile = os.path.join(backup_dir, "knot_backup.label")
 
+if master.valgrind:
+    master.semantic_check = False
+    master2.semantic_check = False
+
 t.start()
 serials_init = master.zones_wait(zones)
 
index d2ab1828eac2791a7eec821ea909abb7b4d859a6..9e2f1870893f4ab3124c0a6c9a8c1100d5338703 100644 (file)
@@ -17,6 +17,10 @@ master.dnssec(zone).enable = True
 master.zonefile_sync = 0
 slave.zonefile_sync = 0
 
+if master.valgrind:
+    master.semantic_check = False
+    slave.semantic_check = False
+
 t.start()
 
 m_zfpath = master.zones[zone[0].name].zfile.path