diff --git a/pkg/agent/agent_suite_test.go b/pkg/agent/agent_suite_test.go index fee27967..6dc7d2cf 100644 --- a/pkg/agent/agent_suite_test.go +++ b/pkg/agent/agent_suite_test.go @@ -60,7 +60,7 @@ func TestAPIs(t *testing.T) { RunSpecs(t, "Agent Suite") } -var _ = BeforeSuite(BeforeSuiteSetup(), 60) +var _ = BeforeSuite(BeforeSuiteSetup()) func BeforeSuiteSetup() func() { return func() { diff --git a/pkg/agentserver/agentserver_suite_test.go b/pkg/agentserver/agentserver_suite_test.go index 77f01812..3908cb21 100644 --- a/pkg/agentserver/agentserver_suite_test.go +++ b/pkg/agentserver/agentserver_suite_test.go @@ -63,7 +63,7 @@ func TestAPIs(t *testing.T) { RunSpecs(t, "Agent Server Suite") } -var _ = BeforeSuite(BeforeSuiteSetup(), 60) +var _ = BeforeSuite(BeforeSuiteSetup()) func BeforeSuiteSetup() func() { return func() { diff --git a/pkg/apis/heist.youniqx.com/v1alpha1/vaultkvsecretengine_webhook_test.go b/pkg/apis/heist.youniqx.com/v1alpha1/vaultkvsecretengine_webhook_test.go index 88320ade..f05797fb 100644 --- a/pkg/apis/heist.youniqx.com/v1alpha1/vaultkvsecretengine_webhook_test.go +++ b/pkg/apis/heist.youniqx.com/v1alpha1/vaultkvsecretengine_webhook_test.go @@ -126,5 +126,5 @@ var _ = Describe("VaultKVSecretEngine Webhooks", func() { return K8sClient.Delete(ctx, engine) }).Should(Succeed()) }) - }, 60) + }) }) diff --git a/pkg/apis/heist.youniqx.com/v1alpha1/vaulttransitengine_webhook_test.go b/pkg/apis/heist.youniqx.com/v1alpha1/vaulttransitengine_webhook_test.go index 8c7cb7d5..875dbb0d 100644 --- a/pkg/apis/heist.youniqx.com/v1alpha1/vaulttransitengine_webhook_test.go +++ b/pkg/apis/heist.youniqx.com/v1alpha1/vaulttransitengine_webhook_test.go @@ -39,5 +39,5 @@ var _ = Describe("VaultKVSecretEngine Webhooks", func() { } Expect(K8sClient.Create(ctx, engine)).To(Succeed()) }) - }, 60) + }) }) diff --git a/pkg/apis/heist.youniqx.com/v1alpha1/vaulttransitkey_webhook_test.go b/pkg/apis/heist.youniqx.com/v1alpha1/vaulttransitkey_webhook_test.go index 32f72e80..8028abd0 100644 --- a/pkg/apis/heist.youniqx.com/v1alpha1/vaulttransitkey_webhook_test.go +++ b/pkg/apis/heist.youniqx.com/v1alpha1/vaulttransitkey_webhook_test.go @@ -54,5 +54,5 @@ var _ = Describe("VaultKVSecretEngine Webhooks", func() { } Expect(K8sClient.Create(ctx, key)).To(Succeed()) }) - }, 60) + }) }) diff --git a/pkg/apis/heist.youniqx.com/v1alpha1/webhook_suite_test.go b/pkg/apis/heist.youniqx.com/v1alpha1/webhook_suite_test.go index 20323370..26adb786 100644 --- a/pkg/apis/heist.youniqx.com/v1alpha1/webhook_suite_test.go +++ b/pkg/apis/heist.youniqx.com/v1alpha1/webhook_suite_test.go @@ -173,7 +173,7 @@ var _ = BeforeSuite(func() { K8sClient = mgr.GetClient() Expect(K8sClient).NotTo(BeNil()) -}, 60) +}) var _ = AfterSuite(func() { cancel() diff --git a/pkg/controllers/e2e_test/vaultbinding/suite_test.go b/pkg/controllers/e2e_test/vaultbinding/suite_test.go index 8578e1ba..e2b13426 100644 --- a/pkg/controllers/e2e_test/vaultbinding/suite_test.go +++ b/pkg/controllers/e2e_test/vaultbinding/suite_test.go @@ -35,6 +35,6 @@ func TestAPIs(t *testing.T) { } var ( - _ = BeforeSuite(Test.BeforeSuiteSetup, 60) + _ = BeforeSuite(Test.BeforeSuiteSetup) _ = AfterSuite(Test.AfterSuiteTeardown) ) diff --git a/pkg/controllers/e2e_test/vaultbinding/vaultbinding_controller_test.go b/pkg/controllers/e2e_test/vaultbinding/vaultbinding_controller_test.go index 15465c4a..ccc3d733 100644 --- a/pkg/controllers/e2e_test/vaultbinding/vaultbinding_controller_test.go +++ b/pkg/controllers/e2e_test/vaultbinding/vaultbinding_controller_test.go @@ -333,5 +333,5 @@ var _ = Describe("VaultBinding Controller", func() { By("Deleting the Auth Role if all bindings are deleted") Expect(Test.K8sClient.Delete(context.TODO(), secondBinding)).To(Succeed()) Test.VaultEnv.KubernetesAuthRole(managed.KubernetesAuth, roleName).WithTimeout(5 * time.Minute).Should(BeNil()) - }, 60) + }) }) diff --git a/pkg/controllers/e2e_test/vaultcertificateauthority/suite_test.go b/pkg/controllers/e2e_test/vaultcertificateauthority/suite_test.go index ad43bc21..7dfcdc78 100644 --- a/pkg/controllers/e2e_test/vaultcertificateauthority/suite_test.go +++ b/pkg/controllers/e2e_test/vaultcertificateauthority/suite_test.go @@ -35,6 +35,6 @@ func TestAPIs(t *testing.T) { } var ( - _ = BeforeSuite(Test.BeforeSuiteSetup, 60) + _ = BeforeSuite(Test.BeforeSuiteSetup) _ = AfterSuite(Test.AfterSuiteTeardown) ) diff --git a/pkg/controllers/e2e_test/vaultcertificaterole/suite_test.go b/pkg/controllers/e2e_test/vaultcertificaterole/suite_test.go index 86ea7a81..8f419d3a 100644 --- a/pkg/controllers/e2e_test/vaultcertificaterole/suite_test.go +++ b/pkg/controllers/e2e_test/vaultcertificaterole/suite_test.go @@ -35,6 +35,6 @@ func TestAPIs(t *testing.T) { } var ( - _ = BeforeSuite(Test.BeforeSuiteSetup, 60) + _ = BeforeSuite(Test.BeforeSuiteSetup) _ = AfterSuite(Test.AfterSuiteTeardown) ) diff --git a/pkg/controllers/e2e_test/vaultkvengine/suite_test.go b/pkg/controllers/e2e_test/vaultkvengine/suite_test.go index 8b28bdb0..93741b66 100644 --- a/pkg/controllers/e2e_test/vaultkvengine/suite_test.go +++ b/pkg/controllers/e2e_test/vaultkvengine/suite_test.go @@ -35,6 +35,6 @@ func TestAPIs(t *testing.T) { } var ( - _ = BeforeSuite(Test.BeforeSuiteSetup, 60) + _ = BeforeSuite(Test.BeforeSuiteSetup) _ = AfterSuite(Test.AfterSuiteTeardown) ) diff --git a/pkg/controllers/e2e_test/vaultkvengine/vaultkvsecret_controller_test.go b/pkg/controllers/e2e_test/vaultkvengine/vaultkvsecret_controller_test.go index a7ee7549..ae94cc81 100644 --- a/pkg/controllers/e2e_test/vaultkvengine/vaultkvsecret_controller_test.go +++ b/pkg/controllers/e2e_test/vaultkvengine/vaultkvsecret_controller_test.go @@ -51,5 +51,5 @@ var _ = Describe("VaultKVSecretEngine Controller", func() { Expect(Test.K8sClient.Delete(context.TODO(), engine)).To(Succeed()) Test.K8sEnv.Object(engine).Should(BeNil()) Test.VaultEnv.KvEngine(engine).Should(BeNil()) - }, 60) + }) }) diff --git a/pkg/controllers/e2e_test/vaultkvsecret/suite_test.go b/pkg/controllers/e2e_test/vaultkvsecret/suite_test.go index f2971508..399982d1 100644 --- a/pkg/controllers/e2e_test/vaultkvsecret/suite_test.go +++ b/pkg/controllers/e2e_test/vaultkvsecret/suite_test.go @@ -35,6 +35,6 @@ func TestAPIs(t *testing.T) { } var ( - _ = BeforeSuite(Test.BeforeSuiteSetup, 60) + _ = BeforeSuite(Test.BeforeSuiteSetup) _ = AfterSuite(Test.AfterSuiteTeardown) ) diff --git a/pkg/controllers/e2e_test/vaultsyncsecret/suite_test.go b/pkg/controllers/e2e_test/vaultsyncsecret/suite_test.go index 83bbb21b..05863d95 100644 --- a/pkg/controllers/e2e_test/vaultsyncsecret/suite_test.go +++ b/pkg/controllers/e2e_test/vaultsyncsecret/suite_test.go @@ -35,6 +35,6 @@ func TestAPIs(t *testing.T) { } var ( - _ = BeforeSuite(Test.BeforeSuiteSetup, 60) + _ = BeforeSuite(Test.BeforeSuiteSetup) _ = AfterSuite(Test.AfterSuiteTeardown) ) diff --git a/pkg/controllers/e2e_test/vaulttransitengine/suite_test.go b/pkg/controllers/e2e_test/vaulttransitengine/suite_test.go index 459f930e..a4e7aad2 100644 --- a/pkg/controllers/e2e_test/vaulttransitengine/suite_test.go +++ b/pkg/controllers/e2e_test/vaulttransitengine/suite_test.go @@ -35,6 +35,6 @@ func TestAPIs(t *testing.T) { } var ( - _ = BeforeSuite(Test.BeforeSuiteSetup, 60) + _ = BeforeSuite(Test.BeforeSuiteSetup) _ = AfterSuite(Test.AfterSuiteTeardown) ) diff --git a/pkg/controllers/e2e_test/vaulttransitkey/suite_test.go b/pkg/controllers/e2e_test/vaulttransitkey/suite_test.go index 30e60c57..51222150 100644 --- a/pkg/controllers/e2e_test/vaulttransitkey/suite_test.go +++ b/pkg/controllers/e2e_test/vaulttransitkey/suite_test.go @@ -35,6 +35,6 @@ func TestAPIs(t *testing.T) { } var ( - _ = BeforeSuite(Test.BeforeSuiteSetup, 60) + _ = BeforeSuite(Test.BeforeSuiteSetup) _ = AfterSuite(Test.AfterSuiteTeardown) ) diff --git a/pkg/controllers/suite_test.go b/pkg/controllers/suite_test.go index 2cc43809..35c733d6 100644 --- a/pkg/controllers/suite_test.go +++ b/pkg/controllers/suite_test.go @@ -67,7 +67,7 @@ func TestAPIs(t *testing.T) { RunSpecs(t, "Controller Suite") } -var _ = BeforeSuite(BeforeSuiteSetup(), 60) +var _ = BeforeSuite(BeforeSuiteSetup()) func BeforeSuiteSetup() func() { return func() { diff --git a/pkg/injector/injector_suite_test.go b/pkg/injector/injector_suite_test.go index f0dc8fbe..e47b1a2a 100644 --- a/pkg/injector/injector_suite_test.go +++ b/pkg/injector/injector_suite_test.go @@ -54,7 +54,7 @@ func TestAPIs(t *testing.T) { RunSpecs(t, "Agent Suite") } -var _ = BeforeSuite(BeforeSuiteSetup(), 60) +var _ = BeforeSuite(BeforeSuiteSetup()) func BeforeSuiteSetup() func() { return func() { diff --git a/pkg/vault/e2e_test/suite_test.go b/pkg/vault/e2e_test/suite_test.go index 8b122428..27977cd4 100644 --- a/pkg/vault/e2e_test/suite_test.go +++ b/pkg/vault/e2e_test/suite_test.go @@ -53,7 +53,7 @@ var _ = BeforeSuite(func() { vaultAPI, err = vaultEnv.GetAPI() Expect(err).NotTo(HaveOccurred()) Expect(vaultAPI).NotTo(BeNil()) -}, 60) +}) var _ = AfterSuite(func() { By("tearing down the test environment")