From 811e816b2f34c28623210de4bee784175c86b06c Mon Sep 17 00:00:00 2001 From: Jakub Al-Khalili Date: Mon, 15 Jul 2019 09:14:53 +0200 Subject: [PATCH] Fixed tests --- pkg/controller/jenkins/configuration/base/validate.go | 2 +- .../jenkins/configuration/base/validate_test.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/controller/jenkins/configuration/base/validate.go b/pkg/controller/jenkins/configuration/base/validate.go index 61f801e0..ee7a8822 100644 --- a/pkg/controller/jenkins/configuration/base/validate.go +++ b/pkg/controller/jenkins/configuration/base/validate.go @@ -93,7 +93,7 @@ func (r *ReconcileJenkinsBaseConfiguration) validateImagePullSecret(name string) r.logger.V(log.VWarn).Info("Docker Password is empty") 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") return false, nil } diff --git a/pkg/controller/jenkins/configuration/base/validate_test.go b/pkg/controller/jenkins/configuration/base/validate_test.go index 7a8aedbf..3dcb258c 100644 --- a/pkg/controller/jenkins/configuration/base/validate_test.go +++ b/pkg/controller/jenkins/configuration/base/validate_test.go @@ -217,7 +217,7 @@ func TestReconcileJenkinsBaseConfiguration_validateImagePullSecrets(t *testing.T baseReconcileLoop := New(fakeClient, nil, logf.ZapLogger(false), &jenkins, false, false, nil, nil) - got, err := baseReconcileLoop.validateImagePullSecrets() + got, _ := baseReconcileLoop.validateImagePullSecrets() assert.Equal(t, got, false) }) @@ -250,7 +250,7 @@ func TestReconcileJenkinsBaseConfiguration_validateImagePullSecrets(t *testing.T baseReconcileLoop := New(fakeClient, nil, logf.ZapLogger(false), &jenkins, false, false, nil, nil) - got, err := baseReconcileLoop.validateImagePullSecrets() + got, _ := baseReconcileLoop.validateImagePullSecrets() assert.Equal(t, got, false) }) @@ -283,7 +283,7 @@ func TestReconcileJenkinsBaseConfiguration_validateImagePullSecrets(t *testing.T baseReconcileLoop := New(fakeClient, nil, logf.ZapLogger(false), &jenkins, false, false, nil, nil) - got, err := baseReconcileLoop.validateImagePullSecrets() + got, _ := baseReconcileLoop.validateImagePullSecrets() assert.Equal(t, got, false) }) @@ -316,7 +316,7 @@ func TestReconcileJenkinsBaseConfiguration_validateImagePullSecrets(t *testing.T baseReconcileLoop := New(fakeClient, nil, logf.ZapLogger(false), &jenkins, false, false, nil, nil) - got, err := baseReconcileLoop.validateImagePullSecrets() + got, _ := baseReconcileLoop.validateImagePullSecrets() assert.Equal(t, got, false) }) }