Merge pull request kubernetes-sigs#12230 from sivchari/followup-flaky

k8s-ci-robot · web-flow · commit 2d0f76e2b276 · 2025-05-16T05:09:14.000-07:00
🐛 CAPIM: mux: fix error check
diff --git a/test/infrastructure/inmemory/pkg/server/mux.go b/test/infrastructure/inmemory/pkg/server/mux.go
@@ -612,7 +612,7 @@ func (m *WorkloadClustersMux) DeleteWorkloadClusterListener(wclName string) erro
 	}
 
 	if wcl.listener != nil {
-		if err := wcl.listener.Close(); !errors.Is(err, net.ErrClosed) {
+		if err := wcl.listener.Close(); err != nil && !errors.Is(err, net.ErrClosed) {
 			return errors.Wrapf(err, "failed to stop WorkloadClusterListener %s, %s", wclName, wcl.HostPort())
 		}
 	}
@@ -634,7 +634,7 @@ func (m *WorkloadClustersMux) Shutdown(ctx context.Context) error {
 	}
 
 	// NOTE: this closes all the listeners
-	if err := m.muxServer.Shutdown(ctx); !errors.Is(err, net.ErrClosed) {
+	if err := m.muxServer.Shutdown(ctx); err != nil && !errors.Is(err, net.ErrClosed) {
 		return errors.Wrap(err, "failed to shutdown the mux server")
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -612,7 +612,7 @@ func (m *WorkloadClustersMux) DeleteWorkloadClusterListener(wclName string) erro`
`612`	`612`	`}`
`613`	`613`
`614`	`614`	`if wcl.listener != nil {`
`615`		`- if err := wcl.listener.Close(); !errors.Is(err, net.ErrClosed) {`
	`615`	`+ if err := wcl.listener.Close(); err != nil && !errors.Is(err, net.ErrClosed) {`
`616`	`616`	`return errors.Wrapf(err, "failed to stop WorkloadClusterListener %s, %s", wclName, wcl.HostPort())`
`617`	`617`	`}`
`618`	`618`	`}`
`@@ -634,7 +634,7 @@ func (m *WorkloadClustersMux) Shutdown(ctx context.Context) error {`
`634`	`634`	`}`
`635`	`635`
`636`	`636`	`// NOTE: this closes all the listeners`
`637`		`- if err := m.muxServer.Shutdown(ctx); !errors.Is(err, net.ErrClosed) {`
	`637`	`+ if err := m.muxServer.Shutdown(ctx); err != nil && !errors.Is(err, net.ErrClosed) {`
`638`	`638`	`return errors.Wrap(err, "failed to shutdown the mux server")`
`639`	`639`	`}`
`640`	`640`