status-im
/
nimbus-eth2
mirror of https://github.com/status-im/nimbus-eth2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

improve cleanup in error situation in slashing protection tests (#5991) 

If removing a file files during `slashing_protection/test_fixtures.nim`,
still continue to try to remove the other ephemeral test files.
This commit is contained in:
Etan Kissling 2024-02-28 18:28:04 +01:00 committed by GitHub
parent d77af57ce0
commit 57f4886d39
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/slashing_protection/test_fixtures.nim
View File

@ -1,10 +1,11 @@
# Nimbus # beacon_chain
# Copyright (c) 2018-2024 Status Research & Development GmbH # Copyright (c) 2018-2024 Status Research & Development GmbH
# Licensed under either of # Licensed under either of
# * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or https://www.apache.org/licenses/LICENSE-2.0) # * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or https://www.apache.org/licenses/LICENSE-2.0)
# * MIT license ([LICENSE-MIT](LICENSE-MIT) or https://opensource.org/licenses/MIT) # * MIT license ([LICENSE-MIT](LICENSE-MIT) or https://opensource.org/licenses/MIT)
# at your option. This file may not be copied, modified, or distributed except according to those terms. # at your option. This file may not be copied, modified, or distributed except according to those terms.
{.push raises: [].}
{.used.} {.used.}
import import
@ -86,9 +87,11 @@ chronicles.formatIt CandidateBlock: it.toHexLogs
chronicles.formatIt CandidateVote: it.toHexLogs chronicles.formatIt CandidateVote: it.toHexLogs
proc sqlite3db_delete(basepath, dbname: string) = proc sqlite3db_delete(basepath, dbname: string) =
removeFile(basepath / dbname&".sqlite3-shm") for extension in [".sqlite3-shm", ".sqlite3-wal", ".sqlite3"]:
removeFile(basepath / dbname&".sqlite3-wal") try:
removeFile(basepath / dbname&".sqlite3") removeFile(basepath / dbname&extension)
except OSError:
discard
const InterchangeTestsDir = FixturesDir / "tests-slashing-v5.3.0" / "tests" / "generated" const InterchangeTestsDir = FixturesDir / "tests-slashing-v5.3.0" / "tests" / "generated"
const TestDir = "" const TestDir = ""
@ -147,7 +150,7 @@ proc statusOkOrDuplicateOrMinEpochViolation(
return true return true
return false return false
proc runTest(identifier: string) = proc runTest(identifier: string) {.raises: [IOError, SerializationError].} =
# The tests produce a lot of log noise # The tests produce a lot of log noise
# echo "\n\n===========================================\n\n" # echo "\n\n===========================================\n\n"