UPSTREAM: <carry>: don't fail integration due to too many goroutines …

…- revert This reverts commit 79b249c.
openshift · Jul 1, 2024 · 309017f · 309017f
1 parent b341a56
commit 309017f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/test/integration/framework/etcd.go b/test/integration/framework/etcd.go
@@ -226,7 +226,8 @@ func EtcdMain(tests func() int) {
 	klog.StopFlushDaemon()
 
 	if err := goleakFindRetry(goleakOpts...); err != nil {
-		klog.InfoS("EtcdMain goroutine check", "err", err)
+		klog.ErrorS(err, "EtcdMain goroutine check")
+		result = 1
 	}
 
 	os.Exit(result)

diff --git a/test/integration/scheduler_perf/scheduler_perf.go b/test/integration/scheduler_perf/scheduler_perf.go
@@ -758,7 +758,7 @@ func RunBenchmarkPerfScheduling(b *testing.B, outOfTreePluginRegistry frameworkr
 					// because then during cleanup, the
 					// test will wait for goroutines to
 					// quit *before* restoring klog settings.
-					// framework.GoleakCheck(b)
+					framework.GoleakCheck(b)
 
 					// Now that we are ready to run, start
 					// etcd.

diff --git a/test/integration/scheduler_perf/scheduler_test.go b/test/integration/scheduler_perf/scheduler_test.go
@@ -35,7 +35,7 @@ func TestScheduling(t *testing.T) {
 	}
 
 	// Check for leaks at the very end.
-	// framework.GoleakCheck(t)
+	framework.GoleakCheck(t)
 
 	// All integration test cases share the same etcd, similar to
 	// https://github.com/kubernetes/kubernetes/blob/18d05b646d09b2971dc5400bc288062b0414e8cf/test/integration/framework/etcd.go#L186-L222.