mirror of
https://github.com/isc-projects/bind9.git
synced 2026-06-12 17:30:00 -04:00
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.
(cherry picked from commit e786a2e950)
This commit is contained in:
parent
270970a461
commit
e19e108698
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