From: Nicki Křížek <nicki@isc.org>
Date: Thu, 19 Jun 2025 13:09:39 +0000 (+0200)
Subject: Ignore softhsm2 errors when deleting token in keyfromlabel test
X-Git-Tag: v9.21.10~42^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e786a2e950411fb3ffe1aed140cc4520e4ffd74a;p=thirdparty%2Fbind9.git

Ignore softhsm2 errors when deleting token in keyfromlabel test

In some rare cases, the softhsm2 utility reports failure to delete the
token directory, despite the token being found. Subsequent attempts to
delete the token again indicate that the token was deleted.

Ignore this cleanup error, as it doesn't prevent our tests from working
properly. There is also an attempt to delete the token before the test
starts which ensures a clean state before the test is executed, in case
there's actually a leftover token.
---

diff --git a/bin/tests/system/keyfromlabel/tests_keyfromlabel.py b/bin/tests/system/keyfromlabel/tests_keyfromlabel.py
index 37e6888b528..dc3fe553286 100644
--- a/bin/tests/system/keyfromlabel/tests_keyfromlabel.py
+++ b/bin/tests/system/keyfromlabel/tests_keyfromlabel.py
@@ -70,7 +70,7 @@ def token_init_and_cleanup():
     isctest.run.cmd(
         token_cleanup_command,
         env=EMPTY_OPENSSL_CONF_ENV,
-        log_stderr=False,
+        log_stdout=True,
         raise_on_exception=False,
     )
 
@@ -82,7 +82,10 @@ def token_init_and_cleanup():
         yield
     finally:
         output = isctest.run.cmd(
-            token_cleanup_command, env=EMPTY_OPENSSL_CONF_ENV, log_stdout=True
+            token_cleanup_command,
+            env=EMPTY_OPENSSL_CONF_ENV,
+            log_stdout=True,
+            raise_on_exception=False,
         ).stdout.decode("utf-8")
         assert re.search("Found token (.*) with matching token label", output)
         assert re.search("The token (.*) has been deleted", output)