Test components/recipes in parallel

playground/components_test.go

@@ -9,20 +9,25 @@ import (
 	"path/filepath"
 	"regexp"
 	"strings"
+	"sync"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/require"
 )
 
 func TestRecipeOpstackSimple(t *testing.T) {
+	t.Parallel()
+
 	tt := newTestFramework(t)
 	defer tt.Close()
 
 	tt.test(&OpRecipe{}, nil)
 }
 
 func TestRecipeOpstackExternalBuilder(t *testing.T) {
+	t.Parallel()
+
 	tt := newTestFramework(t)
 	defer tt.Close()
 
@@ -32,6 +37,8 @@ func TestRecipeOpstackExternalBuilder(t *testing.T) {
 }
 
 func TestRecipeOpstackEnableForkAfter(t *testing.T) {
+	t.Parallel()
+
 	tt := newTestFramework(t)
 	defer tt.Close()
 
@@ -46,13 +53,17 @@ func TestRecipeOpstackEnableForkAfter(t *testing.T) {
 }
 
 func TestRecipeL1Simple(t *testing.T) {
+	t.Parallel()
+
 	tt := newTestFramework(t)
 	defer tt.Close()
 
 	tt.test(&L1Recipe{}, nil)
 }
 
 func TestRecipeL1UseNativeReth(t *testing.T) {
+	t.Parallel()
+
 	tt := newTestFramework(t)
 	defer tt.Close()
 
@@ -62,6 +73,8 @@ func TestRecipeL1UseNativeReth(t *testing.T) {
 }
 
 func TestComponentBuilderHub(t *testing.T) {
+	t.Parallel()
+
 	tt := newTestFramework(t)
 	defer tt.Close()
 
@@ -83,6 +96,8 @@ func newTestFramework(t *testing.T) *testFramework {
 	return &testFramework{t: t}
 }
 
+var artifactsLock sync.Mutex
+
 func (tt *testFramework) test(s ServiceGen, args []string) *Manifest {
 	t := tt.t
 
@@ -114,7 +129,10 @@ func (tt *testFramework) test(s ServiceGen, args []string) *Manifest {
 		err := recipe.Flags().Parse(args)
 		require.NoError(t, err)
 
+		artifactsLock.Lock()
 		_, err = recipe.Artifacts().OutputDir(e2eTestDir).Build()
+		artifactsLock.Unlock()
+
 		require.NoError(t, err)
 	}
 
@@ -136,7 +154,6 @@ func (tt *testFramework) test(s ServiceGen, args []string) *Manifest {
 	dockerRunner, err := NewLocalRunner(cfg)
 	require.NoError(t, err)
 
-	dockerRunner.cleanupNetwork = true
 	tt.runner = dockerRunner
 
 	err = dockerRunner.Run(context.Background())

playground/local_runner.go

@@ -43,10 +43,6 @@ type LocalRunner struct {
 	manifest *Manifest
 	client   *client.Client
 
-	// reservedPorts is a map of port numbers reserved for each service to avoid conflicts
-	// since we reserve ports for all the services before they are used
-	reservedPorts map[int]bool
-
 	// handles stores the references to the processes that are running on host machine
 	// they are executed sequentially so we do not need to lock the handles
 	handles []*exec.Cmd
@@ -57,9 +53,6 @@ type LocalRunner struct {
 	// tasks tracks the status of each service
 	tasksMtx sync.Mutex
 	tasks    map[string]*task
-
-	// whether to remove the network name after execution (used in testing)
-	cleanupNetwork bool
 }
 
 type task struct {
@@ -147,14 +140,13 @@ func NewLocalRunner(cfg *RunnerConfig) (*LocalRunner, error) {
 	}
 
 	d := &LocalRunner{
-		config:        cfg,
-		out:           cfg.Out,
-		manifest:      cfg.Manifest,
-		client:        client,
-		reservedPorts: map[int]bool{},
-		handles:       []*exec.Cmd{},
-		tasks:         tasks,
-		exitErr:       make(chan error, 2),
+		config:   cfg,
+		out:      cfg.Out,
+		manifest: cfg.Manifest,
+		client:   client,
+		handles:  []*exec.Cmd{},
+		tasks:    tasks,
+		exitErr:  make(chan error, 2),
 	}
 
 	return d, nil
@@ -247,12 +239,16 @@ func (d *LocalRunner) Stop() error {
 	return nil
 }
 
+var (
+	reservedPorts sync.Map
+)
+
 // reservePort finds the first available port from the startPort and reserves it
 // Note that we have to keep track of the port in 'reservedPorts' because
 // the port allocation happens before the services uses it and binds to it.
 func (d *LocalRunner) reservePort(startPort int, protocol string) int {
 	for i := startPort; i < startPort+1000; i++ {
-		if _, ok := d.reservedPorts[i]; ok {
+		if _, ok := reservedPorts.Load(i); ok {
 			continue
 		}
 
@@ -280,7 +276,7 @@ func (d *LocalRunner) reservePort(startPort int, protocol string) int {
 			panic(fmt.Sprintf("invalid protocol: %s", protocol))
 		}
 
-		d.reservedPorts[i] = true
+		reservedPorts.Store(i, true)
 		return i
 	}
 	panic("BUG: could not reserve a port")