Add timeout configuration support

Author: teddyknox

op-acceptor/config.go

@@ -20,6 +20,7 @@ type Config struct {
 	RunInterval     time.Duration // Interval between test runs
 	RunOnce         bool          // Indicates if the service should exit after one test run
 	AllowSkips      bool          // Allow tests to be skipped instead of failing when preconditions are not met
+	DefaultTimeout  time.Duration // Default timeout for individual tests, can be overriden by test config
 
 	Log log.Logger
 }
@@ -53,6 +54,8 @@ func NewConfig(ctx *cli.Context, log log.Logger, testDir string, validatorConfig
 	runInterval := ctx.Duration(flags.RunInterval.Name)
 	runOnce := runInterval == 0
 
+	defaultTimeout := ctx.Duration(flags.DefaultTimeout.Name)
+
 	return &Config{
 		TestDir:         absTestDir,
 		ValidatorConfig: absValidatorConfig,
@@ -62,5 +65,6 @@ func NewConfig(ctx *cli.Context, log log.Logger, testDir string, validatorConfig
 		RunOnce:         runOnce,
 		AllowSkips:      ctx.Bool(flags.AllowSkips.Name),
 		Log:             log,
+		DefaultTimeout:  defaultTimeout,
 	}, nil
 }

op-acceptor/flags/flags.go

@@ -2,6 +2,7 @@ package flags
 
 import (
 	"fmt"
+	"time"
 
 	"github.com/urfave/cli/v2"
 
@@ -53,6 +54,12 @@ var (
 		EnvVars: opservice.PrefixEnvVar(EnvVarPrefix, "ALLOW_SKIPS"),
 		Usage:   "Allow tests to be skipped instead of failing when preconditions are not met.",
 	}
+	DefaultTimeout = &cli.DurationFlag{
+		Name:    "default-timeout",
+		Value:   5 * time.Minute,
+		EnvVars: opservice.PrefixEnvVar(EnvVarPrefix, "DEFAULT_TIMEOUT"),
+		Usage:   "Default timeout of an individual test (e.g. '30s', '5m', etc.). This setting is superseded by test or suite level timeout configuration. Set to '0' to disable any default timeout. Defaults to '5m'.",
+	}
 )
 
 var requiredFlags = []cli.Flag{
@@ -65,6 +72,7 @@ var optionalFlags = []cli.Flag{
 	GoBinary,
 	RunInterval,
 	AllowSkips,
+	DefaultTimeout,
 }
 var Flags []cli.Flag
 

op-acceptor/nat.go

@@ -48,6 +48,7 @@ func New(ctx context.Context, config *Config, version string, shutdownCallback f
 	reg, err := registry.NewRegistry(registry.Config{
 		Log:                 config.Log,
 		ValidatorConfigFile: config.ValidatorConfig,
+		DefaultTimeout:      config.DefaultTimeout,
 	})
 	if err != nil {
 		return nil, fmt.Errorf("failed to create registry: %w", err)

op-acceptor/registry/registry.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"sync"
+	"time"
 
 	"github.com/ethereum-optimism/infra/op-acceptor/types"
 	"github.com/ethereum/go-ethereum/log"
@@ -21,6 +22,7 @@ type Registry struct {
 type Config struct {
 	Log                 log.Logger
 	ValidatorConfigFile string
+	DefaultTimeout      time.Duration
 }
 
 // NewRegistry creates a new registry instance
@@ -200,6 +202,14 @@ func (r *Registry) discoverTestsInConfig(configs []types.TestConfig, gateID stri
 	var tests []types.ValidatorMetadata
 
 	for _, cfg := range configs {
+
+		var timeout time.Duration
+		if cfg.Timeout != nil {
+			timeout = *cfg.Timeout
+		} else {
+			timeout = r.config.DefaultTimeout
+		}
+
 		// If only package is specified (no name), treat it as "run all"
 		if cfg.Name == "" {
 			tests = append(tests, types.ValidatorMetadata{
@@ -209,6 +219,7 @@ func (r *Registry) discoverTestsInConfig(configs []types.TestConfig, gateID stri
 				Package: cfg.Package,
 				RunAll:  true,
 				Type:    types.ValidatorTypeTest,
+				Timeout: timeout,
 			})
 			continue
 		}
@@ -221,6 +232,7 @@ func (r *Registry) discoverTestsInConfig(configs []types.TestConfig, gateID stri
 			FuncName: cfg.Name,
 			Package:  cfg.Package,
 			Type:     types.ValidatorTypeTest,
+			Timeout:  timeout,
 		})
 	}
 

op-acceptor/runner/runner.go

@@ -72,19 +72,17 @@ type runner struct {
 	workDir    string // Directory for running tests
 	log        log.Logger
 	runID      string
-	timeout    time.Duration // Test timeout
-	goBinary   string        // Path to the Go binary
-	allowSkips bool          // Whether to allow skipping tests when preconditions are not met
+	goBinary   string // Path to the Go binary
+	allowSkips bool   // Whether to allow skipping tests when preconditions are not met
 }
 
 type Config struct {
 	Registry   *registry.Registry
 	TargetGate string
 	WorkDir    string
 	Log        log.Logger
-	Timeout    time.Duration // Test timeout
-	GoBinary   string        // path to the Go binary
-	AllowSkips bool          // Whether to allow skipping tests when preconditions are not met
+	GoBinary   string // path to the Go binary
+	AllowSkips bool   // Whether to allow skipping tests when preconditions are not met
 }
 
 // NewTestRunner creates a new test runner instance
@@ -111,10 +109,6 @@ func NewTestRunner(cfg Config) (TestRunner, error) {
 		return nil, fmt.Errorf("no validators found")
 	}
 
-	if cfg.Timeout == 0 {
-		cfg.Timeout = 5 * time.Minute // Default timeout
-	}
-
 	if cfg.GoBinary == "" {
 		cfg.GoBinary = "go" // Default to "go" if not specified
 	}
@@ -124,7 +118,6 @@ func NewTestRunner(cfg Config) (TestRunner, error) {
 		validators: validators,
 		workDir:    cfg.WorkDir,
 		log:        cfg.Log,
-		timeout:    cfg.Timeout,
 		goBinary:   cfg.GoBinary,
 		allowSkips: cfg.AllowSkips,
 	}, nil
@@ -504,8 +497,13 @@ type TestEvent struct {
 
 // runSingleTest runs a specific test
 func (r *runner) runSingleTest(metadata types.ValidatorMetadata) (*types.TestResult, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), r.timeout)
-	defer cancel()
+
+	ctx := context.Background()
+	if metadata.Timeout != 0 {
+		var cancel func()
+		ctx, cancel = context.WithTimeout(ctx, metadata.Timeout)
+		defer cancel()
+	}
 
 	args := r.buildTestArgs(metadata)
 	cmd := exec.CommandContext(ctx, r.goBinary, args...)
@@ -528,7 +526,7 @@ func (r *runner) runSingleTest(metadata types.ValidatorMetadata) (*types.TestRes
 		"package", metadata.Package,
 		"test", metadata.FuncName,
 		"command", cmd.String(),
-		"timeout", r.timeout,
+		"timeout", metadata.Timeout,
 		"allowSkips", r.allowSkips)
 
 	// Run the command
@@ -539,7 +537,7 @@ func (r *runner) runSingleTest(metadata types.ValidatorMetadata) (*types.TestRes
 		return &types.TestResult{
 			Metadata: metadata,
 			Status:   types.TestStatusFail,
-			Error:    fmt.Errorf("test timed out after %v", r.timeout),
+			Error:    fmt.Errorf("test timed out after %v", metadata.Timeout),
 		}, nil
 	}
 
@@ -763,6 +761,11 @@ func (r *runner) buildTestArgs(metadata types.ValidatorMetadata) []string {
 	// Always disable caching
 	args = append(args, "-count", "1")
 
+	// Add timeout if it's not 0
+	if metadata.Timeout != 0 {
+		args = append(args, "-timeout", metadata.Timeout.String())
+	}
+
 	// Always use verbose output
 	args = append(args, "-v")
 

op-acceptor/runner/runner_test.go

@@ -177,8 +177,9 @@ func TestBuildTestArgs(t *testing.T) {
 			metadata: types.ValidatorMetadata{
 				FuncName: "TestFoo",
 				Package:  "pkg/foo",
+				Timeout:  10 * time.Second,
 			},
-			want: []string{"test", "pkg/foo", "-run", "^TestFoo$", "-count", "1", "-v", "-json"},
+			want: []string{"test", "pkg/foo", "-run", "^TestFoo$", "-count", "1", "-timeout", "10s", "-v", "-json"},
 		},
 		{
 			name: "run all in package",

op-acceptor/types/test.go

@@ -27,9 +27,10 @@ type TestResult struct {
 
 // TestConfig represents a test configuration
 type TestConfig struct {
-	Name    string `yaml:"name,omitempty"`
-	Package string `yaml:"package"`
-	RunAll  bool   `yaml:"run_all,omitempty"`
+	Name    string         `yaml:"name,omitempty"`
+	Package string         `yaml:"package"`
+	RunAll  bool           `yaml:"run_all,omitempty"`
+	Timeout *time.Duration `yaml:"timeout,omitempty"`
 }
 
 // GetTestDisplayName returns a formatted display name for a test based on its name and metadata

op-acceptor/types/validator.go

@@ -33,7 +33,7 @@ type ValidatorMetadata struct {
 	Suite    string
 	FuncName string
 	Package  string
-	Timeout  string
+	Timeout  time.Duration
 	RunAll   bool
 }