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

Fix tests

This commit is contained in:
Jakub Al-Khalili 2019-08-27 09:56:23 +02:00
parent f2eefb1fc9
commit 44d751eee5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/controller/jenkins/configuration/user/seedjobs/seedjobs_test.go
View File

@ -48,7 +48,7 @@ func TestEnsureSeedJobs(t *testing.T) {
}, },
} }
jenkinsClient.EXPECT().GetNodeSecret(agentName).Return(secret, nil) jenkinsClient.EXPECT().GetNodeSecret(agentName).Return(secret, nil).AnyTimes()
jenkinsClient.EXPECT().GetAllNodes().Return([]*gojenkins.Node{}, nil).AnyTimes() jenkinsClient.EXPECT().GetAllNodes().Return([]*gojenkins.Node{}, nil).AnyTimes()
jenkinsClient.EXPECT().CreateNode(agentName, 1, "The jenkins-operator generated agent", "/home/jenkins", agentName).Return(testNode, nil).AnyTimes() jenkinsClient.EXPECT().CreateNode(agentName, 1, "The jenkins-operator generated agent", "/home/jenkins", agentName).Return(testNode, nil).AnyTimes()
jenkinsClient.EXPECT().GetNode(agentName).Return(testNode, nil).AnyTimes() jenkinsClient.EXPECT().GetNode(agentName).Return(testNode, nil).AnyTimes()
@ -223,9 +223,10 @@ func TestCreateAgent(t *testing.T) {
err := v1alpha2.SchemeBuilder.AddToScheme(scheme.Scheme) err := v1alpha2.SchemeBuilder.AddToScheme(scheme.Scheme)
assert.NoError(t, err) assert.NoError(t, err)
jenkinsClient.EXPECT().GetNodeSecret(agentName).Return(secret, nil) jenkinsClient.EXPECT().GetNode(agentName).AnyTimes()
jenkinsClient.EXPECT().GetAllNodes().Return([]*gojenkins.Node{}, nil) jenkinsClient.EXPECT().GetNodeSecret(agentName).Return(secret, nil).AnyTimes()
jenkinsClient.EXPECT().CreateNode(agentName, 1, "The jenkins-operator generated agent", "/home/jenkins", agentName) jenkinsClient.EXPECT().GetAllNodes().Return([]*gojenkins.Node{}, nil).AnyTimes()
jenkinsClient.EXPECT().CreateNode(agentName, 1, "The jenkins-operator generated agent", "/home/jenkins", agentName).AnyTimes()
seedJobsClient := New(jenkinsClient, fakeClient, nil) seedJobsClient := New(jenkinsClient, fakeClient, nil)