public_git
/
kubernetes-operator
mirror of https://github.com/jenkinsci/kubernetes-operator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

#43 Add additional test scenarios

This commit is contained in:
Jakub Al-Khalili 2019-07-10 15:49:53 +02:00
parent 9e73be7a49
commit 076b0aa453
2 changed files with 50 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/jenkins/configuration/base/reconcile.go
View File

@ -139,7 +139,7 @@ func GetJenkinsOpts(jenkins *v1alpha2.Jenkins) map[string]string {
if len(jenkinsOptsWithDashes) == 0 { if len(jenkinsOptsWithDashes) == 0 {
return nil return nil
} }
jenkinsOptsWithEqOperators := strings.Split(jenkinsOptsWithDashes, " ") jenkinsOptsWithEqOperators := strings.Split(jenkinsOptsWithDashes, " ")
for _, vx := range jenkinsOptsWithEqOperators { for _, vx := range jenkinsOptsWithEqOperators {

65
pkg/controller/jenkins/configuration/base/reconcile_test.go
View File

@ -15,6 +15,25 @@ import (
) )
func TestGetJenkinsOpts(t *testing.T) { func TestGetJenkinsOpts(t *testing.T) {
t.Run("JENKINS_OPTS is uninitialized", func(t *testing.T) {
jenkins := &v1alpha2.Jenkins{
Spec: v1alpha2.JenkinsSpec{
Master: v1alpha2.JenkinsMaster{
Containers: []v1alpha2.Container{
{
Env: []corev1.EnvVar{
{Name: "", Value: ""},
},
},
},
},
},
}
opts := GetJenkinsOpts(jenkins)
assert.Equal(t, 0, len(opts))
})
t.Run("JENKINS_OPTS is empty", func(t *testing.T) { t.Run("JENKINS_OPTS is empty", func(t *testing.T) {
jenkins := &v1alpha2.Jenkins{ jenkins := &v1alpha2.Jenkins{
Spec: v1alpha2.JenkinsSpec{ Spec: v1alpha2.JenkinsSpec{
@ -52,14 +71,9 @@ func TestGetJenkinsOpts(t *testing.T) {
opts := GetJenkinsOpts(jenkins) opts := GetJenkinsOpts(jenkins)
assert.Equal(t, 1, len(opts)) assert.Equal(t, 1, len(opts))
assert.NotContains(t, opts, "httpPort")
t.Run("ensure that JENKINS_OPTS not contains --httpPort", func(t *testing.T) { assert.Contains(t, opts, "prefix")
assert.NotContains(t, opts, "httpPort") assert.Equal(t, opts["prefix"], "/jenkins")
})
t.Run("ensure that argument is --prefix", func(t *testing.T) {
assert.Contains(t, opts, "prefix")
})
}) })
t.Run("JENKINS_OPTS have --prefix and --httpPort argument", func(t *testing.T) { t.Run("JENKINS_OPTS have --prefix and --httpPort argument", func(t *testing.T) {
@ -81,15 +95,34 @@ func TestGetJenkinsOpts(t *testing.T) {
assert.Equal(t, 2, len(opts)) assert.Equal(t, 2, len(opts))
t.Run("ensure that argument is --prefix with value /jenkins", func(t *testing.T) { assert.Contains(t, opts, "prefix")
assert.Contains(t, opts, "prefix") assert.Equal(t, opts["prefix"], "/jenkins")
assert.Equal(t, opts["prefix"], "/jenkins")
})
t.Run("ensure that argument is --httpPort with value 8080", func(t *testing.T) { assert.Contains(t, opts, "httpPort")
assert.Contains(t, opts, "httpPort") assert.Equal(t, opts["httpPort"], "8080")
assert.Equal(t, opts["httpPort"], "8080") })
})
t.Run("JENKINS_OPTS have --httpPort argument", func(t *testing.T) {
jenkins := &v1alpha2.Jenkins{
Spec: v1alpha2.JenkinsSpec{
Master: v1alpha2.JenkinsMaster{
Containers: []v1alpha2.Container{
{
Env: []corev1.EnvVar{
{Name: "JENKINS_OPTS", Value: "--httpPort=8080"},
},
},
},
},
},
}
opts := GetJenkinsOpts(jenkins)
assert.Equal(t, 2, len(opts))
assert.NotContains(t, opts, "prefix")
assert.Contains(t, opts, "httpPort")
assert.Equal(t, opts["httpPort"], "8080")
}) })
} }