Updating integration tests to remove docker network. (#50)

Closes #45
cloudspannerecosystem · Feb 16, 2023 · 20ba23d · 20ba23d
1 parent bfd4453
commit 20ba23d
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 40 deletions.
diff --git a/infrastructure/gke.tf → infrastructure/backend_gke.tf b/infrastructure/gke.tf → infrastructure/backend_gke.tf
diff --git a/src/golang/item-service/main_test.go b/src/golang/item-service/main_test.go
@@ -292,17 +292,14 @@ func TestMain(m *testing.M) {
 	ctx := context.Background()
 
 	// Setup the docker network so containers can talk to each other
-	nr := testcontainers.NetworkRequest{
-		Name:       TESTNETWORK,
-		Attachable: true,
-	}
-	_, err := testcontainers.GenericNetwork(ctx, testcontainers.GenericNetworkRequest{
-		NetworkRequest: nr,
+	net, err := testcontainers.GenericNetwork(ctx, testcontainers.GenericNetworkRequest{
+		NetworkRequest: testcontainers.NetworkRequest{
+			Name:           TESTNETWORK,
+			Attachable: true,
+			CheckDuplicate: true,
+		},
 	})
-	if err != nil {
-		fmt.Printf("Error setting up docker test network: %s\n", err)
-		os.Exit(1)
-	}
+	defer net.Remove(ctx)
 
 	// Setup the emulator container and default instance/database
 	spannerEmulator, err := setupSpannerEmulator(ctx)

diff --git a/src/golang/matchmaking-service/main_test.go b/src/golang/matchmaking-service/main_test.go
@@ -277,17 +277,14 @@ func TestMain(m *testing.M) {
 	ctx := context.Background()
 
 	// Setup the docker network so containers can talk to each other
-	nr := testcontainers.NetworkRequest{
-		Name:       TESTNETWORK,
-		Attachable: true,
-	}
-	_, err := testcontainers.GenericNetwork(ctx, testcontainers.GenericNetworkRequest{
-		NetworkRequest: nr,
+	net, err := testcontainers.GenericNetwork(ctx, testcontainers.GenericNetworkRequest{
+		NetworkRequest: testcontainers.NetworkRequest{
+			Name:           TESTNETWORK,
+			Attachable:     true,
+			CheckDuplicate: true,
+		},
 	})
-	if err != nil {
-		fmt.Printf("Error setting up docker test network: %s\n", err)
-		os.Exit(1)
-	}
+	defer net.Remove(ctx)
 
 	// Setup the emulator container and default instance/database
 	spannerEmulator, err := setupSpannerEmulator(ctx)

diff --git a/src/golang/profile-service/main_test.go b/src/golang/profile-service/main_test.go
@@ -243,17 +243,14 @@ func TestMain(m *testing.M) {
 	ctx := context.Background()
 
 	// Setup the docker network so containers can talk to each other
-	nr := testcontainers.NetworkRequest{
-		Name:       TESTNETWORK,
-		Attachable: true,
-	}
-	_, err := testcontainers.GenericNetwork(ctx, testcontainers.GenericNetworkRequest{
-		NetworkRequest: nr,
+	net, err := testcontainers.GenericNetwork(ctx, testcontainers.GenericNetworkRequest{
+		NetworkRequest: testcontainers.NetworkRequest{
+			Name:           TESTNETWORK,
+			Attachable:     true,
+			CheckDuplicate: true,
+		},
 	})
-	if err != nil {
-		fmt.Printf("Error setting up docker test network: %s\n", err)
-		os.Exit(1)
-	}
+	defer net.Remove(ctx)
 
 	// Setup the emulator container and default instance/database
 	spannerEmulator, err := setupSpannerEmulator(ctx)

diff --git a/src/golang/tradepost-service/main_test.go b/src/golang/tradepost-service/main_test.go
@@ -298,17 +298,14 @@ func TestMain(m *testing.M) {
 	ctx := context.Background()
 
 	// Setup the docker network so containers can talk to each other
-	nr := testcontainers.NetworkRequest{
-		Name:       TESTNETWORK,
-		Attachable: true,
-	}
-	_, err := testcontainers.GenericNetwork(ctx, testcontainers.GenericNetworkRequest{
-		NetworkRequest: nr,
+	net, err := testcontainers.GenericNetwork(ctx, testcontainers.GenericNetworkRequest{
+		NetworkRequest: testcontainers.NetworkRequest{
+			Name:           TESTNETWORK,
+			Attachable:     true,
+			CheckDuplicate: true,
+		},
 	})
-	if err != nil {
-		fmt.Printf("Error setting up docker test network: %s\n", err)
-		os.Exit(1)
-	}
+	defer net.Remove(ctx)
 
 	// Setup the emulator container and default instance/database
 	spannerEmulator, err := setupSpannerEmulator(ctx)