From aafbada3ae8f0bd4e5e4233563c124b06961d2d3 Mon Sep 17 00:00:00 2001 From: Michael Gaffney Date: Fri, 2 Apr 2021 19:40:51 -0400 Subject: [PATCH] Remove calls to `t.Helper()` from test methods (not helpers) (#1063) --- internal/auth/password/testing_test.go | 1 - internal/host/static/testing_test.go | 3 --- internal/iam/testing_test.go | 6 ------ internal/kms/testing_test.go | 10 ---------- internal/session/testing_test.go | 1 - internal/target/testing_test.go | 1 - 6 files changed, 22 deletions(-) diff --git a/internal/auth/password/testing_test.go b/internal/auth/password/testing_test.go index b1e0e0cfea..02fa6d874c 100644 --- a/internal/auth/password/testing_test.go +++ b/internal/auth/password/testing_test.go @@ -26,7 +26,6 @@ func Test_TestAuthMethods(t *testing.T) { } func Test_TestAccounts(t *testing.T) { - t.Helper() assert, require := assert.New(t), require.New(t) conn, _ := db.TestSetup(t, "postgres") wrapper := db.TestWrapper(t) diff --git a/internal/host/static/testing_test.go b/internal/host/static/testing_test.go index bfbf45b07e..f6d0f4082b 100644 --- a/internal/host/static/testing_test.go +++ b/internal/host/static/testing_test.go @@ -26,7 +26,6 @@ func Test_TestCatalogs(t *testing.T) { } func Test_TestHosts(t *testing.T) { - t.Helper() assert, require := assert.New(t), require.New(t) conn, _ := db.TestSetup(t, "postgres") wrapper := db.TestWrapper(t) @@ -46,7 +45,6 @@ func Test_TestHosts(t *testing.T) { } func Test_TestSets(t *testing.T) { - t.Helper() assert, require := assert.New(t), require.New(t) conn, _ := db.TestSetup(t, "postgres") wrapper := db.TestWrapper(t) @@ -66,7 +64,6 @@ func Test_TestSets(t *testing.T) { } func Test_TestSetMembers(t *testing.T) { - t.Helper() assert, require := assert.New(t), require.New(t) conn, _ := db.TestSetup(t, "postgres") wrapper := db.TestWrapper(t) diff --git a/internal/iam/testing_test.go b/internal/iam/testing_test.go index 9a58d6486b..5d6ca27d87 100644 --- a/internal/iam/testing_test.go +++ b/internal/iam/testing_test.go @@ -77,7 +77,6 @@ func Test_TestRepo(t *testing.T) { } func Test_TestUser(t *testing.T) { - t.Helper() assert, require := assert.New(t), require.New(t) conn, _ := db.TestSetup(t, "postgres") wrapper := db.TestWrapper(t) @@ -93,7 +92,6 @@ func Test_TestUser(t *testing.T) { } func Test_TestRole(t *testing.T) { - t.Helper() assert, require := assert.New(t), require.New(t) conn, _ := db.TestSetup(t, "postgres") wrapper := db.TestWrapper(t) @@ -112,7 +110,6 @@ func Test_TestRole(t *testing.T) { } func Test_TestRoleGrant(t *testing.T) { - t.Helper() require := require.New(t) conn, _ := db.TestSetup(t, "postgres") wrapper := db.TestWrapper(t) @@ -128,7 +125,6 @@ func Test_TestRoleGrant(t *testing.T) { } func Test_TestUserRole(t *testing.T) { - t.Helper() require := require.New(t) conn, _ := db.TestSetup(t, "postgres") wrapper := db.TestWrapper(t) @@ -164,7 +160,6 @@ func Test_TestUserRole(t *testing.T) { } func Test_TestGroupRole(t *testing.T) { - t.Helper() require := require.New(t) conn, _ := db.TestSetup(t, "postgres") wrapper := db.TestWrapper(t) @@ -202,7 +197,6 @@ func Test_TestGroupRole(t *testing.T) { } func Test_TestGroupMember(t *testing.T) { - t.Helper() require := require.New(t) conn, _ := db.TestSetup(t, "postgres") wrapper := db.TestWrapper(t) diff --git a/internal/kms/testing_test.go b/internal/kms/testing_test.go index 40faecda50..dde5795dc7 100644 --- a/internal/kms/testing_test.go +++ b/internal/kms/testing_test.go @@ -11,7 +11,6 @@ import ( ) func Test_TestRootKey(t *testing.T) { - t.Helper() assert, require := assert.New(t), require.New(t) conn, _ := db.TestSetup(t, "postgres") wrapper := db.TestWrapper(t) @@ -23,7 +22,6 @@ func Test_TestRootKey(t *testing.T) { } func Test_TestRootKeyVersion(t *testing.T) { - t.Helper() assert, require := assert.New(t), require.New(t) conn, _ := db.TestSetup(t, "postgres") wrapper := db.TestWrapper(t) @@ -36,7 +34,6 @@ func Test_TestRootKeyVersion(t *testing.T) { } func Test_TestDatabaseKey(t *testing.T) { - t.Helper() assert, require := assert.New(t), require.New(t) conn, _ := db.TestSetup(t, "postgres") wrapper := db.TestWrapper(t) @@ -52,7 +49,6 @@ func Test_TestDatabaseKey(t *testing.T) { } func Test_TestDatabaseKeyVersion(t *testing.T) { - t.Helper() require := require.New(t) conn, _ := db.TestSetup(t, "postgres") kmsWrapper := db.TestWrapper(t) @@ -67,7 +63,6 @@ func Test_TestDatabaseKeyVersion(t *testing.T) { } func Test_TestOplogKey(t *testing.T) { - t.Helper() assert, require := assert.New(t), require.New(t) conn, _ := db.TestSetup(t, "postgres") wrapper := db.TestWrapper(t) @@ -83,7 +78,6 @@ func Test_TestOplogKey(t *testing.T) { } func Test_TestOplogKeyVersion(t *testing.T) { - t.Helper() require := require.New(t) conn, _ := db.TestSetup(t, "postgres") kmsWrapper := db.TestWrapper(t) @@ -98,7 +92,6 @@ func Test_TestOplogKeyVersion(t *testing.T) { } func Test_TestTokenKey(t *testing.T) { - t.Helper() assert, require := assert.New(t), require.New(t) conn, _ := db.TestSetup(t, "postgres") wrapper := db.TestWrapper(t) @@ -114,7 +107,6 @@ func Test_TestTokenKey(t *testing.T) { } func Test_TestTokenKeyVersion(t *testing.T) { - t.Helper() require := require.New(t) conn, _ := db.TestSetup(t, "postgres") kmsWrapper := db.TestWrapper(t) @@ -129,7 +121,6 @@ func Test_TestTokenKeyVersion(t *testing.T) { } func Test_TestSessionKey(t *testing.T) { - t.Helper() assert, require := assert.New(t), require.New(t) conn, _ := db.TestSetup(t, "postgres") wrapper := db.TestWrapper(t) @@ -145,7 +136,6 @@ func Test_TestSessionKey(t *testing.T) { } func Test_TestSessionKeyVersion(t *testing.T) { - t.Helper() require := require.New(t) conn, _ := db.TestSetup(t, "postgres") kmsWrapper := db.TestWrapper(t) diff --git a/internal/session/testing_test.go b/internal/session/testing_test.go index 4049a27105..7c4657f642 100644 --- a/internal/session/testing_test.go +++ b/internal/session/testing_test.go @@ -78,7 +78,6 @@ func Test_TestWorker(t *testing.T) { } func Test_TestCert(t *testing.T) { - t.Helper() assert, require := assert.New(t), require.New(t) wrapper := db.TestWrapper(t) userId, err := db.NewPublicId(iam.UserPrefix) diff --git a/internal/target/testing_test.go b/internal/target/testing_test.go index 4c932f2221..63e2590da6 100644 --- a/internal/target/testing_test.go +++ b/internal/target/testing_test.go @@ -11,7 +11,6 @@ import ( ) func Test_TestTcpTarget(t *testing.T) { - t.Helper() require := require.New(t) conn, _ := db.TestSetup(t, "postgres") wrapper := db.TestWrapper(t)