From 44d751eee5834d3c443b506ed1a86ef4b9c60b5d Mon Sep 17 00:00:00 2001 From: Jakub Al-Khalili Date: Tue, 27 Aug 2019 09:56:23 +0200 Subject: [PATCH] Fix tests --- .../jenkins/configuration/user/seedjobs/seedjobs_test.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs_test.go b/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs_test.go index 66e717a8..46f1cb9a 100644 --- a/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs_test.go +++ b/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs_test.go @@ -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().CreateNode(agentName, 1, "The jenkins-operator generated agent", "/home/jenkins", 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) assert.NoError(t, err) - jenkinsClient.EXPECT().GetNodeSecret(agentName).Return(secret, nil) - jenkinsClient.EXPECT().GetAllNodes().Return([]*gojenkins.Node{}, nil) - jenkinsClient.EXPECT().CreateNode(agentName, 1, "The jenkins-operator generated agent", "/home/jenkins", agentName) + jenkinsClient.EXPECT().GetNode(agentName).AnyTimes() + jenkinsClient.EXPECT().GetNodeSecret(agentName).Return(secret, nil).AnyTimes() + 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)