Merge branch 'main' into feat/wait-submatch

testcontainers · Dec 20, 2024 · 9ca35b0 · 9ca35b0
2 parents 50bfda7 + 4f67ae0
commit 9ca35b0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/network/network_test.go b/network/network_test.go
@@ -440,3 +440,8 @@ func TestWithNewNetworkContextTimeout(t *testing.T) {
 	require.Empty(t, req.Networks)
 	require.Empty(t, req.NetworkAliases)
 }
+
+func TestCleanupWithNil(t *testing.T) {
+	var network *testcontainers.DockerNetwork
+	testcontainers.CleanupNetwork(t, network)
+}
diff --git a/testing.go b/testing.go
@@ -83,7 +83,9 @@ func CleanupNetwork(tb testing.TB, network Network) {
 	tb.Helper()
 
 	tb.Cleanup(func() {
-		noErrorOrIgnored(tb, network.Remove(context.Background()))
+		if !isNil(network) {
+			noErrorOrIgnored(tb, network.Remove(context.Background()))
+		}
 	})
 }