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

Improve unit tests

This commit is contained in:
Jakub Al-Khalili 2019-07-31 10:51:36 +02:00
parent 7a149c8257
commit 063f0c074b
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/jenkins/groovy/groovy.go
View File

@ -58,7 +58,7 @@ func (g *Groovy) EnsureSingle(source, name, hash, groovyScript string) (requeue
var appliedGroovyScripts []v1alpha2.AppliedGroovyScript var appliedGroovyScripts []v1alpha2.AppliedGroovyScript
for _, ags := range g.jenkins.Status.AppliedGroovyScripts { for _, ags := range g.jenkins.Status.AppliedGroovyScripts {
if ags.Source != source || ags.Name != name { if g.configurationType != ags.ConfigurationType || ags.Source != source || ags.Name != name {
appliedGroovyScripts = append(appliedGroovyScripts, ags) appliedGroovyScripts = append(appliedGroovyScripts, ags)
} }
} }

5
pkg/controller/jenkins/groovy/groovy_test.go
View File

@ -296,19 +296,18 @@ func TestGroovy_EnsureSingle(t *testing.T) {
ctrl := gomock.NewController(t) ctrl := gomock.NewController(t)
defer ctrl.Finish() defer ctrl.Finish()
jenkinsClient := jenkinsclient.NewMockJenkins(ctrl) jenkinsClient := jenkinsclient.NewMockJenkins(ctrl)
jenkinsClient.EXPECT().ExecuteScript(groovyScript).Return("logs", nil) jenkinsClient.EXPECT().ExecuteScript(groovyScript).Return("logs", nil)
jenkinsClient.EXPECT().ExecuteScript(groovyScript).Return("logs", nil) jenkinsClient.EXPECT().ExecuteScript(groovyScript).Return("logs", nil)
groovyClient := New(jenkinsClient, fakeClient, log.Log, jenkins, configurationType, emptyCustomization) groovyClient := New(jenkinsClient, fakeClient, log.Log, jenkins, configurationType, emptyCustomization)
requeue, err := groovyClient.EnsureSingle("test-conf1", "test.groovy", hash, groovyScript) requeue, err := groovyClient.EnsureSingle(source, "test.groovy", hash, groovyScript)
require.NoError(t, err) require.NoError(t, err)
assert.True(t, requeue) assert.True(t, requeue)
groovyClient = New(jenkinsClient, fakeClient, log.Log, jenkins, "another-test-configuration-type", emptyCustomization) groovyClient = New(jenkinsClient, fakeClient, log.Log, jenkins, "another-test-configuration-type", emptyCustomization)
requeue, err = groovyClient.EnsureSingle("test-conf2", "test.groovy", "anotherHash", groovyScript) requeue, err = groovyClient.EnsureSingle(source, "test.groovy", "anotherHash", groovyScript)
require.NoError(t, err) require.NoError(t, err)
assert.True(t, requeue) assert.True(t, requeue)