@@ -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