Merge pull request #198 from dvulpe/fix_192

fixes #192 - guard access to reaper with a mutex

container_test.go

@@ -4,6 +4,7 @@ import (
  "archive/tar"
  "bytes"
  "context"
+ "fmt"
  "io"
  "io/ioutil"
  "strings"
@@ -303,3 +304,43 @@ func Test_GetLogsFromFailedContainer(t *testing.T) {
  t.Fatalf("could not find expected log in %s", log)
  }
 }
+
+func TestShouldStartContainersInParallel(t *testing.T) {
+ ctx, cancel := context.WithTimeout(context.Background(), 1*time.Minute)
+ t.Cleanup(cancel)
+
+ for i := 0; i < 3; i++ {
+ t.Run(fmt.Sprintf("iteration_%d", i), func(t *testing.T) {
+ t.Parallel()
+ createTestContainer(t, ctx)
+ })
+ }
+}
+
+func createTestContainer(t *testing.T, ctx context.Context) int {
+ req := ContainerRequest{
+ Image: "localstack/localstack:latest",
+ ExposedPorts: []string{"4584/tcp", "8080/tcp"},
+ Env: map[string]string{
+ "SERVICES": "secretsmanager",
+ },
+ WaitingFor: wait.ForListeningPort("4584/tcp"),
+ }
+ container, err := GenericContainer(ctx, GenericContainerRequest{
+ ContainerRequest: req,
+ Started: true,
+ })
+ if err != nil {
+ t.Fatalf("could not start container: %v", err)
+ }
+ port, err := container.MappedPort(ctx, "4584")
+ if err != nil {
+ t.Fatalf("could not get mapped port: %v", err)
+ }
+
+ t.Cleanup(func() {
+ container.Terminate(context.Background())
+ })
+
+ return port.Int()
+}

reaper.go

@@ -8,6 +8,7 @@ import (
  "github.com/testcontainers/testcontainers-go/wait"
  "net"
  "strings"
+ "sync"
  "time"
 
  "github.com/pkg/errors"
@@ -22,6 +23,7 @@ const (
 )
 
 var reaper *Reaper // We would like to create reaper only once
+var mutex sync.Mutex
 
 // ReaperProvider represents a provider for the reaper to run itself with
 // The ContainerProvider interface should usually satisfy this as well, so it is pluggable
@@ -38,6 +40,8 @@ type Reaper struct {
 
 // NewReaper creates a Reaper with a sessionID to identify containers and a provider to use
 func NewReaper(ctx context.Context, sessionID string, provider ReaperProvider, reaperImageName string) (*Reaper, error) {
+ mutex.Lock()
+ defer mutex.Unlock()
  // If reaper already exists re-use it
  if reaper != nil {
  return reaper, nil