Merge pull request #113 from jetstack/test-junit

Add junit test reports

Author: jetstack-bot

.gitignore

@@ -1,3 +1,4 @@
 /kube-oidc-proxy
 /bin
 /demo/config.jsonnet
+/artifacts/

Makefile

@@ -1,7 +1,8 @@
 # Copyright Jetstack Ltd. See LICENSE for details.
-BINDIR   ?= $(CURDIR)/bin
-HACK_DIR ?= hack
-PATH     := $(BINDIR):$(PATH)
+BINDIR    ?= $(CURDIR)/bin
+HACK_DIR  ?= hack
+PATH      := $(BINDIR):$(PATH)
+ARTIFACTS ?= artifacts
 
 export GO111MODULE=on
 
@@ -83,9 +84,12 @@ generate: depend ## generates mocks and assets files
 	go generate $$(go list ./pkg/... ./cmd/...)
 
 test: generate verify ## run all go tests
-	go test $$(go list ./pkg/... ./cmd/... | grep -v pkg/e2e)
+	mkdir -p $(ARTIFACTS)
+	go test -v -bench $$(go list ./pkg/... ./cmd/... | grep -v pkg/e2e) | tee $(ARTIFACTS)/go-test.stdout
+	cat $(ARTIFACTS)/go-test.stdout | go run github.com/jstemmer/go-junit-report > $(ARTIFACTS)/junit-go-test.xml
 
 e2e: ## run end to end tests
+	mkdir -p $(ARTIFACTS)
 	KUBE_OIDC_PROXY_ROOT_PATH="$$(pwd)" go test -timeout 30m -v --count=1 ./test/e2e/suite/.
 
 build: generate ## build kube-oidc-proxy

go.mod

@@ -5,6 +5,7 @@ go 1.13
 require (
 	github.com/golang/mock v1.2.0
 	github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40
+	github.com/jstemmer/go-junit-report v0.9.1 // indirect
 	github.com/onsi/ginkgo v1.10.1
 	github.com/onsi/gomega v1.7.0
 	github.com/sirupsen/logrus v1.4.2

go.sum

@@ -150,6 +150,8 @@ github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCV
 github.com/json-iterator/go v1.1.7 h1:KfgG9LzI+pYjr4xvmz/5H4FXjokeP+rlHLhv3iH62Fo=
 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
+github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o=
+github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=

test/e2e/suite/suite_test.go

@@ -2,15 +2,14 @@
 package suite
 
 import (
-	//"fmt"
-	//"path"
+	"os"
+	"path/filepath"
 	"testing"
 	"time"
 
 	"github.com/onsi/ginkgo"
 	ginkgoconfig "github.com/onsi/ginkgo/config"
-
-	//"github.com/onsi/ginkgo/reporters"
+	"github.com/onsi/ginkgo/reporters"
 	"github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/util/wait"
 
@@ -31,13 +30,14 @@ func init() {
 func TestE2E(t *testing.T) {
 	gomega.RegisterFailHandler(ginkgo.Fail)
 
-	var r []ginkgo.Reporter
-	//if framework.DefaultConfig.Ginkgo.ReportDirectory != "" {
-	//	r = append(r, reporters.NewJUnitReporter(path.Join(framework.DefaultConfig.Ginkgo.ReportDirectory,
-	//		fmt.Sprintf("junit_%s_%02d.xml",
-	//			framework.DefaultConfig.Ginkgo.ReportPrefix,
-	//			ginkgoconfig.GinkgoConfig.ParallelNode))))
-	//}
+	junitPath := "../../../artifacts"
+	if path := os.Getenv("ARTIFACTS"); path != "" {
+		junitPath = path
+	}
 
-	ginkgo.RunSpecsWithDefaultAndCustomReporters(t, "kube-oidc-proxy e2e suite", r)
+	junitReporter := reporters.NewJUnitReporter(filepath.Join(
+		junitPath,
+		"junit-go-e2e.xml",
+	))
+	ginkgo.RunSpecsWithDefaultAndCustomReporters(t, "kube-oidc-proxy e2e suite", []ginkgo.Reporter{junitReporter})
 }