mirror of
https://github.com/isc-projects/bind9.git
synced 2026-06-12 18:50:01 -04:00
[9.20] fix: test: 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. Closes #5244 Backport of MR !10607 Merge branch 'backport-5244-ignore-softhsm2util-delete-token-error-9.20' into 'bind-9.20' See merge request isc-projects/bind9!10608
This commit is contained in:
commit
ea48c1e322
1 changed files with 5 additions and 2 deletions
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Reference in a new issue