From 0f5ed144ec8c3c9179092e18c7ff313f9ae6946c Mon Sep 17 00:00:00 2001 From: Jason van Brackel Date: Fri, 16 Jul 2021 12:41:14 -0400 Subject: [PATCH] fix: removing repeat code --- controllers/fortify/suite_test.go | 2 -- controllers/gitlab/suite_test.go | 5 ----- controllers/twistlock/suite_test.go | 3 --- integration-tests/controllers/group_controller_test.go | 2 ++ 4 files changed, 2 insertions(+), 10 deletions(-) create mode 100755 integration-tests/controllers/group_controller_test.go diff --git a/controllers/fortify/suite_test.go b/controllers/fortify/suite_test.go index d6334af..55e6164 100644 --- a/controllers/fortify/suite_test.go +++ b/controllers/fortify/suite_test.go @@ -65,8 +65,6 @@ var _ = BeforeSuite(func() { err = fortifyv1alpha1.AddToScheme(scheme.Scheme) Expect(err).NotTo(HaveOccurred()) - err = fortifyv1alpha1.AddToScheme(scheme.Scheme) - Expect(err).NotTo(HaveOccurred()) //+kubebuilder:scaffold:scheme diff --git a/controllers/gitlab/suite_test.go b/controllers/gitlab/suite_test.go index ec5c85f..593a551 100644 --- a/controllers/gitlab/suite_test.go +++ b/controllers/gitlab/suite_test.go @@ -67,11 +67,6 @@ var _ = BeforeSuite(func() { err = gitlabv1alpha1.AddToScheme(scheme.Scheme) Expect(err).NotTo(HaveOccurred()) - err = gitlabv1alpha1.AddToScheme(scheme.Scheme) - Expect(err).NotTo(HaveOccurred()) - - err = gitlabv1alpha1.AddToScheme(scheme.Scheme) - Expect(err).NotTo(HaveOccurred()) //+kubebuilder:scaffold:scheme diff --git a/controllers/twistlock/suite_test.go b/controllers/twistlock/suite_test.go index 52ce90c..6a95808 100644 --- a/controllers/twistlock/suite_test.go +++ b/controllers/twistlock/suite_test.go @@ -65,9 +65,6 @@ var _ = BeforeSuite(func() { err = twistlockv1alpha1.AddToScheme(scheme.Scheme) Expect(err).NotTo(HaveOccurred()) - err = twistlockv1alpha1.AddToScheme(scheme.Scheme) - Expect(err).NotTo(HaveOccurred()) - //+kubebuilder:scaffold:scheme k8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme}) diff --git a/integration-tests/controllers/group_controller_test.go b/integration-tests/controllers/group_controller_test.go new file mode 100755 index 0000000..083d62a --- /dev/null +++ b/integration-tests/controllers/group_controller_test.go @@ -0,0 +1,2 @@ +package controllers + -- GitLab