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

Fixed tests

This commit is contained in:
Jakub Al-Khalili 2019-07-15 09:14:53 +02:00
parent 74b8ec98ec
commit 811e816b2f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,7 +93,7 @@ func (r *ReconcileJenkinsBaseConfiguration) validateImagePullSecret(name string)
r.logger.V(log.VWarn).Info("Docker Password is empty") r.logger.V(log.VWarn).Info("Docker Password is empty")
return false, nil return false, nil
} }
if secret.Data["docker-email"] == nil { if secret.Data["docker-email"] == nil {
r.logger.V(log.VWarn).Info("Docker Email is empty") r.logger.V(log.VWarn).Info("Docker Email is empty")
return false, nil return false, nil
} }

8
pkg/controller/jenkins/configuration/base/validate_test.go
View File

@ -217,7 +217,7 @@ func TestReconcileJenkinsBaseConfiguration_validateImagePullSecrets(t *testing.T
baseReconcileLoop := New(fakeClient, nil, logf.ZapLogger(false), baseReconcileLoop := New(fakeClient, nil, logf.ZapLogger(false),
&jenkins, false, false, nil, nil) &jenkins, false, false, nil, nil)
got, err := baseReconcileLoop.validateImagePullSecrets() got, _ := baseReconcileLoop.validateImagePullSecrets()
assert.Equal(t, got, false) assert.Equal(t, got, false)
}) })
@ -250,7 +250,7 @@ func TestReconcileJenkinsBaseConfiguration_validateImagePullSecrets(t *testing.T
baseReconcileLoop := New(fakeClient, nil, logf.ZapLogger(false), baseReconcileLoop := New(fakeClient, nil, logf.ZapLogger(false),
&jenkins, false, false, nil, nil) &jenkins, false, false, nil, nil)
got, err := baseReconcileLoop.validateImagePullSecrets() got, _ := baseReconcileLoop.validateImagePullSecrets()
assert.Equal(t, got, false) assert.Equal(t, got, false)
}) })
@ -283,7 +283,7 @@ func TestReconcileJenkinsBaseConfiguration_validateImagePullSecrets(t *testing.T
baseReconcileLoop := New(fakeClient, nil, logf.ZapLogger(false), baseReconcileLoop := New(fakeClient, nil, logf.ZapLogger(false),
&jenkins, false, false, nil, nil) &jenkins, false, false, nil, nil)
got, err := baseReconcileLoop.validateImagePullSecrets() got, _ := baseReconcileLoop.validateImagePullSecrets()
assert.Equal(t, got, false) assert.Equal(t, got, false)
}) })
@ -316,7 +316,7 @@ func TestReconcileJenkinsBaseConfiguration_validateImagePullSecrets(t *testing.T
baseReconcileLoop := New(fakeClient, nil, logf.ZapLogger(false), baseReconcileLoop := New(fakeClient, nil, logf.ZapLogger(false),
&jenkins, false, false, nil, nil) &jenkins, false, false, nil, nil)
got, err := baseReconcileLoop.validateImagePullSecrets() got, _ := baseReconcileLoop.validateImagePullSecrets()
assert.Equal(t, got, false) assert.Equal(t, got, false)
}) })
} }