Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelog/jco-inittestlog-parallel-guard.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
### Ignored
- Add concurrent-use guard to InitTestLog to prevent silent log capture failures in parallel tests
1 change: 1 addition & 0 deletions system_tests/message_extraction_layer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,7 @@ func TestMessageExtractionLayer_TxStreamerHandleReorg(t *testing.T) {

builder := NewNodeBuilder(ctx).
DefaultConfig(t, true).
DontParalellise().
WithDelayBuffer(threshold)

builder.nodeConfig.MessageExtraction.Enable = true
Expand Down
2 changes: 1 addition & 1 deletion system_tests/seqfeed_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ func TestPopulateFeedBacklog(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()

builder := NewNodeBuilder(ctx).DefaultConfig(t, true).WithDatabase(rawdb.DBPebble)
builder := NewNodeBuilder(ctx).DefaultConfig(t, true).DontParalellise().WithDatabase(rawdb.DBPebble)
builder.BuildL1(t)

userAccount := "User2"
Expand Down
4 changes: 0 additions & 4 deletions system_tests/triedb_race_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,10 @@ import (
"github.com/ethereum/go-ethereum/arbitrum"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/rawdb"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/rpc"

"github.com/offchainlabs/nitro/util/testhelpers"
)

func TestTrieDBCommitRace(t *testing.T) {
_ = testhelpers.InitTestLog(t, log.LevelError)
ctx, cancel := context.WithCancel(context.Background())
defer cancel()

Expand Down
2 changes: 1 addition & 1 deletion system_tests/version_alerter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func TestNitroNodeVersionAlerter(t *testing.T) {
upgradeDeadline := time.Now().Add(time.Hour).Format(time.RFC3339)
msg := "Node version or date is below the minimum requirement, please upgrade"

builder := NewNodeBuilder(ctx).DefaultConfig(t, false)
builder := NewNodeBuilder(ctx).DefaultConfig(t, false).DontParalellise()
builder.nodeConfig.VersionAlerterServer.Enable = true
builder.nodeConfig.VersionAlerterServer.MinRequiredNitroByVersion = reqNodeVersion
builder.nodeConfig.VersionAlerterServer.MinRequiredNitroByDate = reqNodeVersionDate
Expand Down
7 changes: 7 additions & 0 deletions util/testhelpers/testhelpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,14 @@ func newLogHandler(t *testing.T) *LogHandler {
}
}

var initTestLogMu sync.Mutex

func InitTestLog(t *testing.T, level slog.Level) *LogHandler {
t.Helper()
if !initTestLogMu.TryLock() {
t.Fatal("InitTestLog called concurrently - this test must not run in parallel")
}
t.Cleanup(initTestLogMu.Unlock)
handler := newLogHandler(t)
glogger := log.NewGlogHandler(handler)
glogger.Verbosity(level)
Expand Down
Loading