more CI futz

Author: frobware

test/integration/metrics_test.go

@@ -317,7 +317,7 @@ func makeHTTPRequest(ctx context.Context, t *testing.T, podName string, port int
 		scheme = "https"
 	}
 
-	url := fmt.Sprintf("%s://localhost:%d%s", scheme, localPort, path)
+	url := fmt.Sprintf("%s://127.0.0.1:%d%s", scheme, localPort, path)
 	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create request: %w", err)
@@ -354,7 +354,7 @@ func makeHTTPRequestToPort(ctx context.Context, t *testing.T, port int, path str
 		scheme = "https"
 	}
 
-	url := fmt.Sprintf("%s://localhost:%d%s", scheme, port, path)
+	url := fmt.Sprintf("%s://127.0.0.1:%d%s", scheme, port, path)
 	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create request: %w", err)
@@ -419,35 +419,46 @@ func setupPortForward(_ context.Context, t *testing.T, podName string, remotePor
 
 	go func() {
 		defer close(errCh)
-		defer func() {
-			if r := recover(); r != nil {
-				errCh <- fmt.Errorf("port forwarding panic: %v", r)
-			}
-		}()
 
 		pf, err := portforward.New(dialer, []string{fmt.Sprintf("0:%d", remotePort)}, stopCh, readyCh, io.Discard, io.Discard)
 		if err != nil {
-			errCh <- fmt.Errorf("port forward init failed: %w", err)
+			select {
+			case errCh <- fmt.Errorf("port forward init failed: %w", err):
+			case <-stopCh:
+				// Channel closed, ignore
+			}
 			return
 		}
 
 		go func() {
 			if err := pf.ForwardPorts(); err != nil {
 				if !strings.Contains(err.Error(), "connection reset") &&
 					!strings.Contains(err.Error(), "use of closed network connection") {
-					errCh <- fmt.Errorf("port forward error: %w", err)
+					select {
+					case errCh <- fmt.Errorf("port forward error: %w", err):
+					case <-stopCh:
+						// Channel closed, ignore
+					}
 				}
 			}
 		}()
 
 		<-readyCh
 		ports, err := pf.GetPorts()
 		if err != nil {
-			errCh <- fmt.Errorf("failed to get forwarded ports: %w", err)
+			select {
+			case errCh <- fmt.Errorf("failed to get forwarded ports: %w", err):
+			case <-stopCh:
+				// Channel closed, ignore
+			}
 			return
 		}
 		if len(ports) == 0 {
-			errCh <- fmt.Errorf("no ports returned from port forwarder")
+			select {
+			case errCh <- fmt.Errorf("no ports returned from port forwarder"):
+			case <-stopCh:
+				// Channel closed, ignore
+			}
 			return
 		}
 
@@ -510,7 +521,7 @@ func ptrInt64(v int64) *int64 {
 }
 
 func extractServerCertificate(port int) (*x509.CertPool, error) {
-	conn, err := tls.Dial("tcp", fmt.Sprintf("localhost:%d", port), &tls.Config{InsecureSkipVerify: true})
+	conn, err := tls.Dial("tcp", fmt.Sprintf("127.0.0.1:%d", port), &tls.Config{InsecureSkipVerify: true})
 	if err != nil {
 		return nil, fmt.Errorf("TLS dial failed: %w", err)
 	}