Skip to content

Commit a33808b

Browse files
committed
test: correct usage of goleak.IgnoreCurrent()
1 parent 3af8bd0 commit a33808b

File tree

2 files changed

+7
-14
lines changed

2 files changed

+7
-14
lines changed

internal/services/integrationtesting/cert_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import (
3838
)
3939

4040
func TestCertRotation(t *testing.T) {
41-
t.Parallel()
41+
defer goleak.VerifyNone(t, goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"))
4242

4343
const (
4444
// length of time the initial cert is valid
@@ -284,5 +284,4 @@ func TestCertRotation(t *testing.T) {
284284
case <-time.After(30 * time.Second):
285285
require.Fail(t, "ungraceful server termination")
286286
}
287-
goleak.VerifyNone(t, goleak.IgnoreCurrent())
288287
}

internal/services/v1/permissions_test.go

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -646,10 +646,8 @@ func TestLookupResources(t *testing.T) {
646646
tf.StandardDatastoreWithData,
647647
)
648648
client := v1.NewPermissionsServiceClient(conn)
649-
t.Cleanup(func() {
650-
goleak.VerifyNone(t, goleak.IgnoreCurrent())
651-
})
652-
t.Cleanup(cleanup)
649+
defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
650+
defer cleanup()
653651

654652
var trailer metadata.MD
655653
lookupClient, err := client.LookupResources(t.Context(), &v1.LookupResourcesRequest{
@@ -994,10 +992,8 @@ func TestLookupSubjects(t *testing.T) {
994992
require := require.New(t)
995993
conn, cleanup, _, revision := testserver.NewTestServer(require, delta, memdb.DisableGC, true, tf.StandardDatastoreWithData)
996994
client := v1.NewPermissionsServiceClient(conn)
997-
t.Cleanup(func() {
998-
goleak.VerifyNone(t, goleak.IgnoreCurrent())
999-
})
1000-
t.Cleanup(cleanup)
995+
defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
996+
defer cleanup()
1001997

1002998
var trailer metadata.MD
1003999
lookupClient, err := client.LookupSubjects(t.Context(), &v1.LookupSubjectsRequest{
@@ -1670,10 +1666,8 @@ func TestLookupResourcesWithCursors(t *testing.T) {
16701666
require := require.New(t)
16711667
conn, cleanup, _, revision := testserver.NewTestServer(require, delta, memdb.DisableGC, true, tf.StandardDatastoreWithData)
16721668
client := v1.NewPermissionsServiceClient(conn)
1673-
t.Cleanup(func() {
1674-
goleak.VerifyNone(t, goleak.IgnoreCurrent())
1675-
})
1676-
t.Cleanup(cleanup)
1669+
defer goleak.VerifyNone(t, goleak.IgnoreCurrent())
1670+
defer cleanup()
16771671

16781672
var currentCursor *v1.Cursor
16791673
foundObjectIds := mapz.NewSet[string]()

0 commit comments

Comments
 (0)