chore: increase wait time to ensure TCP connections

This is port of GoogleCloudPlatform/cloud-sql-proxy#1293.
GoogleCloudPlatform · Sep 13, 2022 · c8af29f · c8af29f
1 parent 5c1b3bd
commit c8af29f
Showing 1 changed file with 2 additions and 17 deletions.
diff --git a/internal/proxy/proxy_test.go b/internal/proxy/proxy_test.go
@@ -325,32 +325,17 @@ func TestClientCloseWaitsForActiveConnections(t *testing.T) {
 		Instances: []proxy.InstanceConnConfig{
 			{Name: "proj:region:pg"},
 		},
+		WaitOnClose: 5 * time.Second,
 	}
-
 	c, err := proxy.NewClient(context.Background(), &fakeDialer{}, logger, in)
 	if err != nil {
 		t.Fatalf("proxy.NewClient error: %v", err)
 	}
 	go c.Serve(context.Background(), func() {})
 
-	conn := tryTCPDial(t, "127.0.0.1:5000")
-	_ = conn.Close()
-
-	if err := c.Close(); err != nil {
-		t.Fatalf("c.Close error: %v", err)
-	}
-
-	in.WaitOnClose = time.Second
-	in.Port = 5001
-	c, err = proxy.NewClient(context.Background(), &fakeDialer{}, logger, in)
-	if err != nil {
-		t.Fatalf("proxy.NewClient error: %v", err)
-	}
-	go c.Serve(context.Background(), func() {})
-
 	var open []net.Conn
 	for i := 0; i < 5; i++ {
-		conn = tryTCPDial(t, "127.0.0.1:5001")
+		conn := tryTCPDial(t, "127.0.0.1:5000")
 		open = append(open, conn)
 	}
 	defer func() {