Commit aed9ee1d authored by Adrian Sutton's avatar Adrian Sutton Committed by GitHub

op-e2e: Fix flake caused by reusing a single system config across multiple tests (#10754)

parent 656a4bd0
...@@ -16,16 +16,8 @@ import ( ...@@ -16,16 +16,8 @@ import (
// TestCheckFjordScript ensures the op-chain-ops/cmd/check-fjord script runs successfully // TestCheckFjordScript ensures the op-chain-ops/cmd/check-fjord script runs successfully
// against a test chain with the fjord hardfork activated/unactivated // against a test chain with the fjord hardfork activated/unactivated
func TestCheckFjordScript(t *testing.T) { func TestCheckFjordScript(t *testing.T) {
log := testlog.Logger(t, log.LevelInfo) InitParallel(t)
cfg := DefaultSystemConfig(t)
genesisActivation := hexutil.Uint64(0) genesisActivation := hexutil.Uint64(0)
cfg.DeployConfig.L1CancunTimeOffset = &genesisActivation
cfg.DeployConfig.L2GenesisRegolithTimeOffset = &genesisActivation
cfg.DeployConfig.L2GenesisCanyonTimeOffset = &genesisActivation
cfg.DeployConfig.L2GenesisDeltaTimeOffset = &genesisActivation
cfg.DeployConfig.L2GenesisEcotoneTimeOffset = &genesisActivation
tests := []struct { tests := []struct {
name string name string
fjordActivation *hexutil.Uint64 fjordActivation *hexutil.Uint64
...@@ -46,6 +38,16 @@ func TestCheckFjordScript(t *testing.T) { ...@@ -46,6 +38,16 @@ func TestCheckFjordScript(t *testing.T) {
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
InitParallel(t) InitParallel(t)
log := testlog.Logger(t, log.LevelInfo)
cfg := DefaultSystemConfig(t)
cfg.DeployConfig.L1CancunTimeOffset = &genesisActivation
cfg.DeployConfig.L2GenesisRegolithTimeOffset = &genesisActivation
cfg.DeployConfig.L2GenesisCanyonTimeOffset = &genesisActivation
cfg.DeployConfig.L2GenesisDeltaTimeOffset = &genesisActivation
cfg.DeployConfig.L2GenesisEcotoneTimeOffset = &genesisActivation
cfg.DeployConfig.L2GenesisFjordTimeOffset = tt.fjordActivation cfg.DeployConfig.L2GenesisFjordTimeOffset = tt.fjordActivation
sys, err := cfg.Start(t) sys, err := cfg.Start(t)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment