From 9763ea5899e5277ca9ccd56e034cc54a541f2c8e Mon Sep 17 00:00:00 2001 From: Jakub Al-Khalili Date: Thu, 12 Sep 2019 15:22:00 +0200 Subject: [PATCH] #96 Small improvements in tests --- .../configuration/base/resources/pod.go | 12 ---------- .../configuration/base/resources/pod_test.go | 23 +++++++++++-------- 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/pkg/controller/jenkins/configuration/base/resources/pod.go b/pkg/controller/jenkins/configuration/base/resources/pod.go index f225ba1d..3cd378cf 100644 --- a/pkg/controller/jenkins/configuration/base/resources/pod.go +++ b/pkg/controller/jenkins/configuration/base/resources/pod.go @@ -150,18 +150,6 @@ func GetJenkinsMasterPodBaseVolumes(jenkins *v1alpha2.Jenkins) []corev1.Volume { return volumes } -func checkSecretVolumesPresence(jenkins *v1alpha2.Jenkins) (groovyExists bool, cascExists bool) { - for _, volume := range GetJenkinsMasterPodBaseVolumes(jenkins) { - if volume.Name == ("gs-" + jenkins.Spec.GroovyScripts.Secret.Name) { - groovyExists = true - } else if volume.Name == ("casc-" + jenkins.Spec.ConfigurationAsCode.Secret.Name) { - cascExists = true - } - } - - return groovyExists, cascExists -} - func getGroovyScriptsSecretVolumeName(jenkins *v1alpha2.Jenkins) string { return "gs-" + jenkins.Spec.GroovyScripts.Secret.Name } diff --git a/pkg/controller/jenkins/configuration/base/resources/pod_test.go b/pkg/controller/jenkins/configuration/base/resources/pod_test.go index 1cca58f4..e198b4f4 100644 --- a/pkg/controller/jenkins/configuration/base/resources/pod_test.go +++ b/pkg/controller/jenkins/configuration/base/resources/pod_test.go @@ -138,18 +138,21 @@ func TestGetJenkinsMasterPodBaseVolumes(t *testing.T) { }, } - groovyExists := false - cascExists := false - - for _, volume := range GetJenkinsMasterPodBaseVolumes(jenkins) { - if volume.Name == ("gs-" + jenkins.Spec.GroovyScripts.Secret.Name) { - groovyExists = true - } else if volume.Name == ("casc-" + jenkins.Spec.ConfigurationAsCode.Secret.Name) { - cascExists = true - } - } + groovyExists, cascExists := checkSecretVolumesPresence(jenkins) assert.True(t, groovyExists) assert.True(t, cascExists) }) } + +func checkSecretVolumesPresence(jenkins *v1alpha2.Jenkins) (groovyExists bool, cascExists bool) { + for _, volume := range GetJenkinsMasterPodBaseVolumes(jenkins) { + if volume.Name == ("gs-" + jenkins.Spec.GroovyScripts.Secret.Name) { + groovyExists = true + } else if volume.Name == ("casc-" + jenkins.Spec.ConfigurationAsCode.Secret.Name) { + cascExists = true + } + } + return groovyExists, cascExists +} +