[test_cleanup_leak] c1

internal/grpctest/grpctest.go

@@ -97,14 +97,13 @@ func RunSubTests(t *testing.T, x interface{}) {
  }
  tfunc := getTestFunc(t, xv, methodName)
  t.Run(strings.TrimPrefix(methodName, "Test"), func(t *testing.T) {
- setup(t)
  // Run leakcheck in t.Cleanup() to guarantee it is run even if tfunc
  // uses t.Fatal().
  //
- // Note that defer doesn't work it runs before t.Cleanup, and a
- // goroutine is closed in a t.Cleanup, a deferred leakcheck will
- // fail.
+ // Note that a defer would run before t.Cleanup, so if a goroutine
+ // is closed by a test's t.Cleanup, a deferred leakcheck would fail.
  t.Cleanup(func() { teardown(t) })
+ setup(t)
  tfunc(t)
  })
  }