mirror of
https://github.com/jenkinsci/kubernetes-operator.git
synced 2026-10-21 04:23:25 +02:00
Improve tests
This commit is contained in:
@@ -57,7 +57,6 @@ type Jenkins interface {
|
||||
Poll() (int, error)
|
||||
ExecuteScript(groovyScript string) (logs string, err error)
|
||||
GetNodeSecret(name string) (string, error)
|
||||
IsNotFoundError(err error) bool
|
||||
}
|
||||
|
||||
type jenkins struct {
|
||||
@@ -68,7 +67,7 @@ type jenkins struct {
|
||||
func (jenkins *jenkins) CreateOrUpdateJob(config, jobName string) (job *gojenkins.Job, created bool, err error) {
|
||||
// create or update
|
||||
job, err = jenkins.GetJob(jobName)
|
||||
if jenkins.IsNotFoundError(err) {
|
||||
if isNotFoundError(err) {
|
||||
job, err = jenkins.CreateJob(config, jobName)
|
||||
created = true
|
||||
return job, true, errors.WithStack(err)
|
||||
@@ -136,7 +135,7 @@ func New(url, user, passwordOrToken string) (Jenkins, error) {
|
||||
return jenkinsClient, nil
|
||||
}
|
||||
|
||||
func (jenkins *jenkins) IsNotFoundError(err error) bool {
|
||||
func isNotFoundError(err error) bool {
|
||||
if err != nil {
|
||||
return err.Error() == errorNotFound.Error()
|
||||
}
|
||||
|
||||
@@ -138,20 +138,6 @@ func (m *MockJenkins) CreateFolder(name string, parents ...string) (*gojenkins.F
|
||||
return ret0, ret1
|
||||
}
|
||||
|
||||
// IsNotFoundError mocks base method
|
||||
func (m *MockJenkins) IsNotFoundError(err error) bool {
|
||||
m.ctrl.T.Helper()
|
||||
ret := m.ctrl.Call(m, "IsNotFoundError", err)
|
||||
ret0, _ := ret[0].(bool)
|
||||
return ret0
|
||||
}
|
||||
|
||||
// IsNotFoundError indicates an expected call of IsNotFoundError
|
||||
func (mr *MockJenkinsMockRecorder) IsNotFoundError(err error) *gomock.Call {
|
||||
mr.mock.ctrl.T.Helper()
|
||||
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsNotFoundError", reflect.TypeOf((*MockJenkins)(nil).IsNotFoundError), err)
|
||||
}
|
||||
|
||||
// CreateFolder indicates an expected call of CreateFolder
|
||||
func (mr *MockJenkinsMockRecorder) CreateFolder(name interface{}, parents ...interface{}) *gomock.Call {
|
||||
mr.mock.ctrl.T.Helper()
|
||||
|
||||
Reference in New Issue
Block a user