From 8dd899c7d23fb79e8bf89ecf2422054f480e728b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20S=C4=99k?= Date: Thu, 19 Sep 2019 13:27:47 +0200 Subject: [PATCH] #110 Fix unit tests and formatting --- cmd/manager/main.go | 6 ++--- go.sum | 3 +++ .../configuration/base/resources/pod_test.go | 1 - .../configuration/base/validate_test.go | 4 ++-- pkg/controller/jenkins/plugins/plugin_test.go | 24 +++++++++---------- test/e2e/configuration_test.go | 2 +- test/e2e/restorebackup_test.go | 1 + test/e2e/wait.go | 2 +- 8 files changed, 23 insertions(+), 20 deletions(-) diff --git a/cmd/manager/main.go b/cmd/manager/main.go index 663ef71f..47f440e6 100644 --- a/cmd/manager/main.go +++ b/cmd/manager/main.go @@ -18,6 +18,7 @@ import ( "github.com/jenkinsci/kubernetes-operator/version" "github.com/operator-framework/operator-sdk/pkg/k8sutil" + kubemetrics "github.com/operator-framework/operator-sdk/pkg/kube-metrics" "github.com/operator-framework/operator-sdk/pkg/leader" "github.com/operator-framework/operator-sdk/pkg/log/zap" "github.com/operator-framework/operator-sdk/pkg/metrics" @@ -25,11 +26,10 @@ import ( sdkVersion "github.com/operator-framework/operator-sdk/version" "github.com/pkg/errors" "github.com/spf13/pflag" - "k8s.io/client-go/kubernetes" - _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" - kubemetrics "github.com/operator-framework/operator-sdk/pkg/kube-metrics" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/intstr" + "k8s.io/client-go/kubernetes" + _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/client/config" "sigs.k8s.io/controller-runtime/pkg/manager" diff --git a/go.sum b/go.sum index b7158951..12f607e9 100644 --- a/go.sum +++ b/go.sum @@ -427,6 +427,7 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20190404164418-38d8ce5564a5/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49NNxhdi2PrY7gxVSq1JjLDc= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190909091759-094676da4a83 h1:mgAKeshyNqWKdENOnQsg+8dRTwZFIwFaO3HNl52sweA= golang.org/x/crypto v0.0.0-20190909091759-094676da4a83/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -458,6 +459,7 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7 h1:rTIdg5QFRR7XCaK4LCjBiPbx8j4DQRpdYMnGn/bJUEU= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190909003024-a7b16738d86b h1:XfVGCX+0T4WOStkaOsJRllbsiImhB2jgVBGc9L0lPGc= golang.org/x/net v0.0.0-20190909003024-a7b16738d86b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20170412232759-a6bd8cefa181/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -494,6 +496,7 @@ golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb h1:fgwFCsaw9buMuxNd6+DQfAuSFqbNiQZpcgJQAgJsK6k= golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190910064555-bbd175535a8b h1:3S2h5FadpNr0zUUCVZjlKIEYF+KaX/OBplTGo89CYHI= golang.org/x/sys v0.0.0-20190910064555-bbd175535a8b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/pkg/controller/jenkins/configuration/base/resources/pod_test.go b/pkg/controller/jenkins/configuration/base/resources/pod_test.go index e198b4f4..bb23047f 100644 --- a/pkg/controller/jenkins/configuration/base/resources/pod_test.go +++ b/pkg/controller/jenkins/configuration/base/resources/pod_test.go @@ -155,4 +155,3 @@ func checkSecretVolumesPresence(jenkins *v1alpha2.Jenkins) (groovyExists bool, c } return groovyExists, cascExists } - diff --git a/pkg/controller/jenkins/configuration/base/validate_test.go b/pkg/controller/jenkins/configuration/base/validate_test.go index 08d409c5..145534f8 100644 --- a/pkg/controller/jenkins/configuration/base/validate_test.go +++ b/pkg/controller/jenkins/configuration/base/validate_test.go @@ -44,7 +44,7 @@ func TestValidatePlugins(t *testing.T) { t.Run("invalid user plugin name", func(t *testing.T) { var requiredBasePlugins []plugins.Plugin var basePlugins []v1alpha2.Plugin - userPlugins := []v1alpha2.Plugin{{Name: "INVALID", Version: "0.0.1"}} + userPlugins := []v1alpha2.Plugin{{Name: "INVALID?", Version: "0.0.1"}} got := baseReconcileLoop.validatePlugins(requiredBasePlugins, basePlugins, userPlugins) @@ -70,7 +70,7 @@ func TestValidatePlugins(t *testing.T) { }) t.Run("invalid base plugin name", func(t *testing.T) { var requiredBasePlugins []plugins.Plugin - basePlugins := []v1alpha2.Plugin{{Name: "INVALID", Version: "0.0.1"}} + basePlugins := []v1alpha2.Plugin{{Name: "INVALID?", Version: "0.0.1"}} var userPlugins []v1alpha2.Plugin got := baseReconcileLoop.validatePlugins(requiredBasePlugins, basePlugins, userPlugins) diff --git a/pkg/controller/jenkins/plugins/plugin_test.go b/pkg/controller/jenkins/plugins/plugin_test.go index de137dc7..2e050a0e 100644 --- a/pkg/controller/jenkins/plugins/plugin_test.go +++ b/pkg/controller/jenkins/plugins/plugin_test.go @@ -44,18 +44,18 @@ func TestVerifyDependencies(t *testing.T) { got := VerifyDependencies(basePlugins) assert.Equal(t, true, got) }) - t.Run("happy, two plugin names with uppercase names", func(t *testing.T) { - basePlugins := map[Plugin][]Plugin{ - Must(New("First-Root-Plugin:1.0.0")): { - Must(New("First_Plugin:0.0.1")), - }, - Must(New("Second_Root_Plugin:1.0.0")): { - Must(New("First_Plugin:0.0.1")), - }, - } - got := VerifyDependencies(basePlugins) - assert.Equal(t, true, got) - }) + t.Run("happy, two plugin names with uppercase names", func(t *testing.T) { + basePlugins := map[Plugin][]Plugin{ + Must(New("First-Root-Plugin:1.0.0")): { + Must(New("First_Plugin:0.0.1")), + }, + Must(New("Second_Root_Plugin:1.0.0")): { + Must(New("First_Plugin:0.0.1")), + }, + } + got := VerifyDependencies(basePlugins) + assert.Equal(t, true, got) + }) t.Run("fail, two root plugins have different versions", func(t *testing.T) { basePlugins := map[Plugin][]Plugin{ Must(New("first-root-plugin:1.0.0")): { diff --git a/test/e2e/configuration_test.go b/test/e2e/configuration_test.go index d5147a4f..d98b612d 100644 --- a/test/e2e/configuration_test.go +++ b/test/e2e/configuration_test.go @@ -129,7 +129,7 @@ func TestPlugins(t *testing.T) { i, err := job.InvokeSimple(map[string]string{}) require.NoError(t, err, i) - waitForJobToFinish(t, job, 2 * time.Second, 2 * time.Minute) + waitForJobToFinish(t, job, 2*time.Second, 2*time.Minute) job, err = jenkinsClient.GetJob(jobID) require.NoError(t, err, job) diff --git a/test/e2e/restorebackup_test.go b/test/e2e/restorebackup_test.go index 6ce36383..e13ecf10 100644 --- a/test/e2e/restorebackup_test.go +++ b/test/e2e/restorebackup_test.go @@ -9,6 +9,7 @@ import ( "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" + framework "github.com/operator-framework/operator-sdk/pkg/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/test/e2e/wait.go b/test/e2e/wait.go index cd7afc04..df6d15ab 100644 --- a/test/e2e/wait.go +++ b/test/e2e/wait.go @@ -2,7 +2,6 @@ package e2e import ( goctx "context" - "github.com/bndr/gojenkins" "net/http" "testing" "time" @@ -12,6 +11,7 @@ import ( jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" + "github.com/bndr/gojenkins" framework "github.com/operator-framework/operator-sdk/pkg/test" "github.com/pkg/errors" "github.com/stretchr/testify/assert"