diff --git a/test/contract/audit/audit_test.go b/test/contract/audit/audit_test.go index 9930157bf9..3f2225e001 100644 --- a/test/contract/audit/audit_test.go +++ b/test/contract/audit/audit_test.go @@ -17,7 +17,7 @@ import ( func TestDefaultAuditingGet(t *testing.T) { ctx := context.Background() - contract.RunGoContractTest(ctx, t, "get default auditing", func(ch contract.ContractHelper) { + contract.RunGoContractTest(ctx, t, "get default auditing", func(t *testing.T, ch contract.ContractHelper) { projectName := utils.RandomName("default-auditing-project") require.NoError(t, ch.AddResources(ctx, 5*time.Minute, contract.DefaultAtlasProject(projectName))) testProjectID, err := ch.ProjectID(ctx, projectName) @@ -88,7 +88,7 @@ func TestSyncs(t *testing.T) { ), }, } - contract.RunGoContractTest(ctx, t, "test syncs", func(ch contract.ContractHelper) { + contract.RunGoContractTest(ctx, t, "test syncs", func(t *testing.T, ch contract.ContractHelper) { projectName := utils.RandomName("audit-syncs-project") require.NoError(t, ch.AddResources(ctx, 5*time.Minute, contract.DefaultAtlasProject(projectName))) testProjectID, err := ch.ProjectID(ctx, projectName) diff --git a/test/contract/ipaccesslist/ipaccesslist_test.go b/test/contract/ipaccesslist/ipaccesslist_test.go index 1549627267..e0bd1f21a4 100644 --- a/test/contract/ipaccesslist/ipaccesslist_test.go +++ b/test/contract/ipaccesslist/ipaccesslist_test.go @@ -19,7 +19,7 @@ import ( func TestList(t *testing.T) { ctx := context.Background() - contract.RunGoContractTest(ctx, t, "get default auditing", func(ch contract.ContractHelper) { + contract.RunGoContractTest(ctx, t, "get default auditing", func(t *testing.T, ch contract.ContractHelper) { projectName := utils.RandomName("default-auditing-project") prj := contract.DefaultAtlasProject(projectName).(*akov2.AtlasProject) diff --git a/test/contract/networkpeering/networkpeering_test.go b/test/contract/networkpeering/networkpeering_test.go index 128b5059bd..a0b69c824c 100644 --- a/test/contract/networkpeering/networkpeering_test.go +++ b/test/contract/networkpeering/networkpeering_test.go @@ -28,7 +28,7 @@ const ( func TestPeerServiceCRUD(t *testing.T) { ctx := context.Background() - contract.RunGoContractTest(ctx, t, "test peer CRUD", func(ch contract.ContractHelper) { + contract.RunGoContractTest(ctx, t, "test peer CRUD", func(t *testing.T, ch contract.ContractHelper) { projectName := utils.RandomName("peer-connection-crud-project") require.NoError(t, ch.AddResources(ctx, 5*time.Minute, contract.DefaultAtlasProject(projectName))) testProjectID, err := ch.ProjectID(ctx, projectName) diff --git a/test/helper/contract/contract.go b/test/helper/contract/contract.go index 7c18cdf88b..2ef77f41b7 100644 --- a/test/helper/contract/contract.go +++ b/test/helper/contract/contract.go @@ -52,7 +52,7 @@ func (ct *contractTest) cleanup(ctx context.Context) error { return nil } -func RunGoContractTest(ctx context.Context, t *testing.T, name string, contractTest func(ch ContractHelper)) { +func RunGoContractTest(ctx context.Context, t *testing.T, name string, contractTest func(t *testing.T, ch ContractHelper)) { if err := skipCheck(name, os.Getenv("AKO_CONTRACT_TEST_FOCUS"), control.Enabled("AKO_CONTRACT_TEST")); err != nil { t.Skipf("Skipping contract test: %v", err.Error()) } @@ -61,7 +61,7 @@ func RunGoContractTest(ctx context.Context, t *testing.T, name string, contractT require.NoError(t, ct.cleanup(ctx)) }() t.Run(name, func(t *testing.T) { - contractTest(ct) + contractTest(t, ct) }) } diff --git a/test/helper/contract/contract_test.go b/test/helper/contract/contract_test.go index d74efd1c4a..2d66e197cf 100644 --- a/test/helper/contract/contract_test.go +++ b/test/helper/contract/contract_test.go @@ -22,7 +22,7 @@ const ( func TestContractTestSkip(t *testing.T) { ctx := context.Background() testWithEnv(func() { - contract.RunGoContractTest(ctx, t, "Skip contract test", func(_ contract.ContractHelper) { + contract.RunGoContractTest(ctx, t, "Skip contract test", func(t *testing.T, _ contract.ContractHelper) { panic("should not have got here!") }) }, "-AKO_CONTRACT_TEST") @@ -32,7 +32,7 @@ func TestContractTestClientSetFails(t *testing.T) { ctx := context.Background() testWithEnv(func() { assert.Panics(t, func() { - contract.RunGoContractTest(ctx, t, "bad client settings panics", func(_ contract.ContractHelper) {}) + contract.RunGoContractTest(ctx, t, "bad client settings panics", func(t *testing.T, _ contract.ContractHelper) {}) }) }, "AKO_CONTRACT_TEST=1", @@ -43,12 +43,12 @@ func TestContractTestClientSetFails(t *testing.T) { func TestContractsWithResources(t *testing.T) { ctx := context.Background() - contract.RunGoContractTest(ctx, t, "run contract test list projects", func(ch contract.ContractHelper) { + contract.RunGoContractTest(ctx, t, "run contract test list projects", func(t *testing.T, ch contract.ContractHelper) { ch.AddResources(ctx, time.Minute, contract.DefaultAtlasProject("contract-tests-list-projects")) _, _, err := ch.AtlasClient().ProjectsApi.ListProjects(ctx).Execute() assert.NoError(t, err) }) - contract.RunGoContractTest(ctx, t, "run contract test list orgs", func(ch contract.ContractHelper) { + contract.RunGoContractTest(ctx, t, "run contract test list orgs", func(t *testing.T, ch contract.ContractHelper) { ch.AddResources(ctx, time.Minute, contract.DefaultAtlasProject("contract-tests-list-orgs")) _, _, err := ch.AtlasClient().OrganizationsApi.ListOrganizations(ctx).Execute() assert.NoError(t, err)