From 8e4b00e9494973e4516e8c611fd568b10d173490 Mon Sep 17 00:00:00 2001 From: YamasouA Date: Wed, 5 Mar 2025 09:24:47 +0900 Subject: [PATCH] use Cleanup instead of defer --- test/integration/scheduler_perf/scheduler_perf.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test/integration/scheduler_perf/scheduler_perf.go b/test/integration/scheduler_perf/scheduler_perf.go index c907cf51bb6..7754ef7a75d 100644 --- a/test/integration/scheduler_perf/scheduler_perf.go +++ b/test/integration/scheduler_perf/scheduler_perf.go @@ -1515,9 +1515,11 @@ func runWorkload(tCtx ktesting.TContext, tc *testCase, w *workload, informerFact workload: w, } - defer executor.wg.Wait() - defer executor.collectorWG.Wait() - defer tCtx.Cancel("workload is done") + tCtx.TB().Cleanup(func() { + tCtx.Cancel("workload is done") + executor.collectorWG.Wait() + executor.wg.Wait() + }) for opIndex, op := range unrollWorkloadTemplate(tCtx, tc.WorkloadTemplate, w) { realOp, err := op.realOp.patchParams(w)