From 2ecbe46e0d2de75a357d5d2da06638ecf806e617 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicki=20K=C5=99=C3=AD=C5=BEek?= <nicki@isc.org>
Date: Wed, 8 Oct 2025 11:35:24 +0200
Subject: [PATCH] Disable keyfromlabel collision avoidance in tests

With the collision avoidance on, some of the tests would occasionally
fail. None of the tests using keyfromlabel are revoking the keys so it
should be safe to disable it.
---
 bin/tests/system/enginepkcs11/setup.sh              | 2 +-
 bin/tests/system/keyfromlabel/tests_keyfromlabel.py | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/tests/system/enginepkcs11/setup.sh b/bin/tests/system/enginepkcs11/setup.sh
index dac6e4c7c5..dadace2f20 100644
--- a/bin/tests/system/enginepkcs11/setup.sh
+++ b/bin/tests/system/enginepkcs11/setup.sh
@@ -40,7 +40,7 @@ keyfromlabel() {
   dir="$4"
   shift 4
 
-  $KEYFRLAB -K $dir -a $alg -l "pkcs11:token=softhsm2-enginepkcs11;object=${id}-${zone};pin-source=$PWD/ns1/pin" "$@" $zone >>keyfromlabel.out.$zone.$id 2>keyfromlabel.err.$zone.$id || return 1
+  $KEYFRLAB -K $dir -a $alg -y -l "pkcs11:token=softhsm2-enginepkcs11;object=${id}-${zone};pin-source=$PWD/ns1/pin" "$@" $zone >>keyfromlabel.out.$zone.$id 2>keyfromlabel.err.$zone.$id || return 1
   cat keyfromlabel.out.$zone.$id
 }
 
diff --git a/bin/tests/system/keyfromlabel/tests_keyfromlabel.py b/bin/tests/system/keyfromlabel/tests_keyfromlabel.py
index 67b2893152..8fddbd4dd5 100644
--- a/bin/tests/system/keyfromlabel/tests_keyfromlabel.py
+++ b/bin/tests/system/keyfromlabel/tests_keyfromlabel.py
@@ -138,6 +138,7 @@ def test_keyfromlabel(alg_name, alg_type, alg_bits):
             os.environ["KEYFRLAB"],
             "-a",
             alg_name,
+            "-y",
             "-l",
             f"pkcs11:token=softhsm2-keyfromlabel;object={key_id}-{zone};pin-source=pin",
             *key_flag,