Commit 28fe81cf authored by Adrian Sutton's avatar Adrian Sutton Committed by GitHub

op-e2e: Reallocate e2e tests to even out run time between the two executors. (#8809)

parent 104909cb
...@@ -128,7 +128,8 @@ func TestOutputCannon_PublishCannonRootClaim(t *testing.T) { ...@@ -128,7 +128,8 @@ func TestOutputCannon_PublishCannonRootClaim(t *testing.T) {
} }
func TestOutputCannonDisputeGame(t *testing.T) { func TestOutputCannonDisputeGame(t *testing.T) {
op_e2e.InitParallel(t, op_e2e.UsesCannon, op_e2e.UseExecutor(outputCannonTestExecutor)) executor := uint64(1) // Different executor to the other tests to help balance things better
op_e2e.InitParallel(t, op_e2e.UsesCannon, op_e2e.UseExecutor(executor))
tests := []struct { tests := []struct {
name string name string
...@@ -141,7 +142,7 @@ func TestOutputCannonDisputeGame(t *testing.T) { ...@@ -141,7 +142,7 @@ func TestOutputCannonDisputeGame(t *testing.T) {
for _, test := range tests { for _, test := range tests {
test := test test := test
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
op_e2e.InitParallel(t, op_e2e.UseExecutor(outputCannonTestExecutor)) op_e2e.InitParallel(t, op_e2e.UseExecutor(executor))
ctx := context.Background() ctx := context.Background()
sys, l1Client := startFaultDisputeSystem(t) sys, l1Client := startFaultDisputeSystem(t)
...@@ -178,7 +179,8 @@ func TestOutputCannonDisputeGame(t *testing.T) { ...@@ -178,7 +179,8 @@ func TestOutputCannonDisputeGame(t *testing.T) {
} }
func TestOutputCannonDefendStep(t *testing.T) { func TestOutputCannonDefendStep(t *testing.T) {
op_e2e.InitParallel(t, op_e2e.UsesCannon, op_e2e.UseExecutor(outputCannonTestExecutor)) executor := uint64(1) // Different executor to the other tests to help balance things better
op_e2e.InitParallel(t, op_e2e.UsesCannon, op_e2e.UseExecutor(executor))
ctx := context.Background() ctx := context.Background()
sys, l1Client := startFaultDisputeSystem(t) sys, l1Client := startFaultDisputeSystem(t)
...@@ -214,7 +216,8 @@ func TestOutputCannonDefendStep(t *testing.T) { ...@@ -214,7 +216,8 @@ func TestOutputCannonDefendStep(t *testing.T) {
} }
func TestOutputCannonProposedOutputRootValid(t *testing.T) { func TestOutputCannonProposedOutputRootValid(t *testing.T) {
op_e2e.InitParallel(t, op_e2e.UsesCannon, op_e2e.UseExecutor(outputCannonTestExecutor)) executor := uint64(1) // Different executor to the other tests to help balance things better
op_e2e.InitParallel(t, op_e2e.UsesCannon, op_e2e.UseExecutor(executor))
// honestStepsFail attempts to perform both an attack and defend step using the correct trace. // honestStepsFail attempts to perform both an attack and defend step using the correct trace.
honestStepsFail := func(ctx context.Context, game *disputegame.OutputCannonGameHelper, correctTrace *disputegame.OutputHonestHelper, parentClaimIdx int64) { honestStepsFail := func(ctx context.Context, game *disputegame.OutputCannonGameHelper, correctTrace *disputegame.OutputHonestHelper, parentClaimIdx int64) {
// Attack step should fail // Attack step should fail
...@@ -271,7 +274,7 @@ func TestOutputCannonProposedOutputRootValid(t *testing.T) { ...@@ -271,7 +274,7 @@ func TestOutputCannonProposedOutputRootValid(t *testing.T) {
for _, test := range tests { for _, test := range tests {
test := test test := test
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
op_e2e.InitParallel(t, op_e2e.UseExecutor(0)) op_e2e.InitParallel(t, op_e2e.UseExecutor(executor))
ctx := context.Background() ctx := context.Background()
sys, l1Client := startFaultDisputeSystem(t) sys, l1Client := startFaultDisputeSystem(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