Merge pull request projectcalico#1891 from lwr20/lwr-write-reports

Enable test reports for all test runners
kgtw · Sep 12, 2018 · fd48539 · fd48539
2 parents af9cbcf + 7e9bfe1
commit fd48539
Show file tree

Hide file tree

Showing 27 changed files with 45 additions and 27 deletions.
diff --git a/.gitignore b/.gitignore
@@ -42,7 +42,7 @@ htmlcov/
 /python/
 /version.txt
 /.dir-locals.el
-junit.xml
+/report/*.xml
 # Old go sub-dir, used to be where we kept go source.
 /go/
 

diff --git a/calc/calc_suite_test.go b/calc/calc_suite_test.go
@@ -35,6 +35,6 @@ func init() {
 
 func TestCalculationGraph(t *testing.T) {
 	RegisterFailHandler(Fail)
-	junitReporter := reporters.NewJUnitReporter("junit.xml")
+	junitReporter := reporters.NewJUnitReporter("../report/calc_suite.xml")
 	RunSpecsWithDefaultAndCustomReporters(t, "Calculation graph Suite", []Reporter{junitReporter})
 }
diff --git a/config/config_suite_test.go b/config/config_suite_test.go
@@ -31,6 +31,6 @@ func init() {
 
 func TestConfig(t *testing.T) {
 	RegisterFailHandler(Fail)
-	junitReporter := reporters.NewJUnitReporter("junit.xml")
+	junitReporter := reporters.NewJUnitReporter("../report/config_suite.xml")
 	RunSpecsWithDefaultAndCustomReporters(t, "Config Suite", []Reporter{junitReporter})
 }
diff --git a/conntrack/conntrack_suite_test.go b/conntrack/conntrack_suite_test.go
@@ -31,6 +31,6 @@ func init() {
 
 func TestConntrack(t *testing.T) {
 	RegisterFailHandler(Fail)
-	junitReporter := reporters.NewJUnitReporter("junit.xml")
+	junitReporter := reporters.NewJUnitReporter("../report/conntrack_suite.xml")
 	RunSpecsWithDefaultAndCustomReporters(t, "Conntrack Suite", []Reporter{junitReporter})
 }
diff --git a/dataplane/linux/intdataplane_fv_suite_test.go b/dataplane/linux/intdataplane_fv_suite_test.go
@@ -31,6 +31,6 @@ func init() {
 
 func TestIntdataplane(t *testing.T) {
 	RegisterFailHandler(Fail)
-	junitReporter := reporters.NewJUnitReporter("junit.xml")
+	junitReporter := reporters.NewJUnitReporter("../../report/intdataplane_fv_suite.xml")
 	RunSpecsWithDefaultAndCustomReporters(t, "Intdataplane Suite", []Reporter{junitReporter})
 }
diff --git a/dataplane/linux/intdataplane_ut_suite_test.go b/dataplane/linux/intdataplane_ut_suite_test.go
@@ -35,6 +35,6 @@ func init() {
 
 func TestIntdataplane(t *testing.T) {
 	RegisterFailHandler(Fail)
-	junitReporter := reporters.NewJUnitReporter("junit.xml")
+	junitReporter := reporters.NewJUnitReporter("../../report/intdataplane_ut_suite.xml")
 	RunSpecsWithDefaultAndCustomReporters(t, "Intdataplane Suite", []Reporter{junitReporter})
 }
diff --git a/dataplane/windows/windataplane_ut_suite_test.go b/dataplane/windows/windataplane_ut_suite_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Tigera, Inc. All rights reserved.
+// Copyright (c) 2017-2018 Tigera, Inc. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,9 +19,18 @@ import (
 	. "github.com/onsi/gomega"
 
 	"testing"
+
+	"github.com/onsi/ginkgo/reporters"
+
+	"github.com/projectcalico/libcalico-go/lib/testutils"
 )
 
+func init() {
+	testutils.HookLogrusForGinkgo()
+}
+
 func TestWindataplane(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, "Windataplane Suite")
+	junitReporter := reporters.NewJUnitReporter("../../report/windataplane_suite.xml")
+	RunSpecsWithDefaultAndCustomReporters(t, "Windataplane Suite", []Reporter{junitReporter})
 }
diff --git a/fv/fv_suite_test.go b/fv/fv_suite_test.go
@@ -35,7 +35,7 @@ func init() {
 
 func TestFv(t *testing.T) {
 	RegisterFailHandler(Fail)
-	junitReporter := reporters.NewJUnitReporter("junit.xml")
+	junitReporter := reporters.NewJUnitReporter("../report/fv_suite.xml")
 	RunSpecsWithDefaultAndCustomReporters(t, "FV Suite", []Reporter{junitReporter})
 }
 

diff --git a/hashutils/hashutils_suite_test.go b/hashutils/hashutils_suite_test.go
@@ -31,6 +31,6 @@ func init() {
 
 func TestHashutils(t *testing.T) {
 	RegisterFailHandler(Fail)
-	junitReporter := reporters.NewJUnitReporter("junit.xml")
+	junitReporter := reporters.NewJUnitReporter("../report/hashutils_suite.xml")
 	RunSpecsWithDefaultAndCustomReporters(t, "Hashutils Suite", []Reporter{junitReporter})
 }
diff --git a/ifacemonitor/ifacemonitor_suite_test.go b/ifacemonitor/ifacemonitor_suite_test.go
@@ -31,6 +31,6 @@ func init() {
 
 func TestIfacemonitor(t *testing.T) {
 	RegisterFailHandler(Fail)
-	junitReporter := reporters.NewJUnitReporter("junit.xml")
+	junitReporter := reporters.NewJUnitReporter("../report/ifacemonitor_suite.xml")
 	RunSpecsWithDefaultAndCustomReporters(t, "Ifacemonitor Suite", []Reporter{junitReporter})
 }
diff --git a/ip/ip_suite_test.go b/ip/ip_suite_test.go
@@ -29,7 +29,7 @@ import (
 
 func TestIp(t *testing.T) {
 	RegisterFailHandler(Fail)
-	junitReporter := reporters.NewJUnitReporter("junit.xml")
+	junitReporter := reporters.NewJUnitReporter("../report/ip_suite.xml")
 	RunSpecsWithDefaultAndCustomReporters(t, "IP Suite", []Reporter{junitReporter})
 }
 

diff --git a/ipsets/ipsets_suite_test.go b/ipsets/ipsets_suite_test.go
@@ -35,6 +35,6 @@ func init() {
 
 func TestCalculationGraph(t *testing.T) {
 	RegisterFailHandler(Fail)
-	junitReporter := reporters.NewJUnitReporter("junit.xml")
+	junitReporter := reporters.NewJUnitReporter("../report/ipsets_suite.xml")
 	RunSpecsWithDefaultAndCustomReporters(t, "IP sets Suite", []Reporter{junitReporter})
 }
diff --git a/iptables/iptables_fv_suite_test.go b/iptables/iptables_fv_suite_test.go
@@ -31,6 +31,6 @@ func init() {
 
 func TestIptablesFV(t *testing.T) {
 	RegisterFailHandler(Fail)
-	junitReporter := reporters.NewJUnitReporter("junit.xml")
+	junitReporter := reporters.NewJUnitReporter("../report/iptables_fv_suite.xml")
 	RunSpecsWithDefaultAndCustomReporters(t, "Iptables Suite", []Reporter{junitReporter})
 }
diff --git a/iptables/iptables_ut_suite_test.go b/iptables/iptables_ut_suite_test.go
@@ -31,6 +31,6 @@ func init() {
 
 func TestIptablesUT(t *testing.T) {
 	RegisterFailHandler(Fail)
-	junitReporter := reporters.NewJUnitReporter("junit.xml")
+	junitReporter := reporters.NewJUnitReporter("../report/iptables_ut_suite.xml")
 	RunSpecsWithDefaultAndCustomReporters(t, "Iptables Suite", []Reporter{junitReporter})
 }
diff --git a/jitter/jitter_suite_test.go b/jitter/jitter_suite_test.go
@@ -31,6 +31,6 @@ func init() {
 
 func TestJitter(t *testing.T) {
 	RegisterFailHandler(Fail)
-	junitReporter := reporters.NewJUnitReporter("junit.xml")
+	junitReporter := reporters.NewJUnitReporter("../report/jitter_suite.xml")
 	RunSpecsWithDefaultAndCustomReporters(t, "Jitter Suite", []Reporter{junitReporter})
 }
diff --git a/k8sfv/k8sfv_suite_test.go b/k8sfv/k8sfv_suite_test.go
@@ -43,6 +43,6 @@ func init() {
 
 func TestMain(t *testing.T) {
 	RegisterFailHandler(Fail)
-	junitReporter := reporters.NewJUnitReporter("junit.xml")
+	junitReporter := reporters.NewJUnitReporter("../report/k8sfv_suite.xml")
 	RunSpecsWithDefaultAndCustomReporters(t, "Felix/KDD FV tests", []Reporter{junitReporter})
 }
diff --git a/labelindex/labelindex_suite_test.go b/labelindex/labelindex_suite_test.go
@@ -31,6 +31,6 @@ func init() {
 
 func TestLabels(t *testing.T) {
 	RegisterFailHandler(Fail)
-	junitReporter := reporters.NewJUnitReporter("junit.xml")
+	junitReporter := reporters.NewJUnitReporter("../report/labels_suite.xml")
 	RunSpecsWithDefaultAndCustomReporters(t, "Labels Suite", []Reporter{junitReporter})
 }
diff --git a/markbits/markbits_suite_test.go b/markbits/markbits_suite_test.go
@@ -31,6 +31,6 @@ func init() {
 
 func TestConfig(t *testing.T) {
 	RegisterFailHandler(Fail)
-	junitReporter := reporters.NewJUnitReporter("junit.xml")
+	junitReporter := reporters.NewJUnitReporter("../report/markbits_suite.xml")
 	RunSpecsWithDefaultAndCustomReporters(t, "MarkBits Suite", []Reporter{junitReporter})
 }
diff --git a/multidict/multidict_suite_test.go b/multidict/multidict_suite_test.go
@@ -31,6 +31,6 @@ func init() {
 
 func TestMultidict(t *testing.T) {
 	RegisterFailHandler(Fail)
-	junitReporter := reporters.NewJUnitReporter("junit.xml")
+	junitReporter := reporters.NewJUnitReporter("../report/multidict_suite.xml")
 	RunSpecsWithDefaultAndCustomReporters(t, "Multidict Suite", []Reporter{junitReporter})
 }
diff --git a/policysync/policysync_suite_test.go b/policysync/policysync_suite_test.go
@@ -18,10 +18,18 @@ import (
 	"testing"
 
 	. "github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/reporters"
 	. "github.com/onsi/gomega"
+
+	"github.com/projectcalico/libcalico-go/lib/testutils"
 )
 
+func init() {
+	testutils.HookLogrusForGinkgo()
+}
+
 func TestPolicysync(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, "Policysync Suite")
+	junitReporter := reporters.NewJUnitReporter("../report/policysync_suite.xml")
+	RunSpecsWithDefaultAndCustomReporters(t, "Policysync Suite", []Reporter{junitReporter})
 }
diff --git a/report/README.txt b/report/README.txt
@@ -0,0 +1 @@
+// This directory is intended to hold the junit XML reports generated by fv and unit tests.
diff --git a/routetable/routetable_suite_test.go b/routetable/routetable_suite_test.go
@@ -31,6 +31,6 @@ func init() {
 
 func TestRules(t *testing.T) {
 	RegisterFailHandler(Fail)
-	junitReporter := reporters.NewJUnitReporter("junit.xml")
+	junitReporter := reporters.NewJUnitReporter("../report/routetable_suite.xml")
 	RunSpecsWithDefaultAndCustomReporters(t, "RouteTable Suite", []Reporter{junitReporter})
 }
diff --git a/rules/rules_suite_test.go b/rules/rules_suite_test.go
@@ -31,6 +31,6 @@ func init() {
 
 func TestRules(t *testing.T) {
 	RegisterFailHandler(Fail)
-	junitReporter := reporters.NewJUnitReporter("junit.xml")
+	junitReporter := reporters.NewJUnitReporter("../report/rules_suite.xml")
 	RunSpecsWithDefaultAndCustomReporters(t, "Rules Suite", []Reporter{junitReporter})
 }
diff --git a/statusrep/statusrep_suite_test.go b/statusrep/statusrep_suite_test.go
@@ -31,6 +31,6 @@ func init() {
 
 func TestStatusrep(t *testing.T) {
 	RegisterFailHandler(Fail)
-	junitReporter := reporters.NewJUnitReporter("junit.xml")
+	junitReporter := reporters.NewJUnitReporter("../report/statusrep_suite.xml")
 	RunSpecsWithDefaultAndCustomReporters(t, "Statusrep Suite", []Reporter{junitReporter})
 }
diff --git a/stringutils/stringutils_suite_test.go b/stringutils/stringutils_suite_test.go
@@ -31,6 +31,6 @@ func init() {
 
 func TestStringutils(t *testing.T) {
 	RegisterFailHandler(Fail)
-	junitReporter := reporters.NewJUnitReporter("junit.xml")
+	junitReporter := reporters.NewJUnitReporter("../report/stringutils_suite.xml")
 	RunSpecsWithDefaultAndCustomReporters(t, "Stringutils Suite", []Reporter{junitReporter})
 }
diff --git a/throttle/throttle_suite_test.go b/throttle/throttle_suite_test.go
@@ -31,6 +31,6 @@ func init() {
 
 func TestJitter(t *testing.T) {
 	RegisterFailHandler(Fail)
-	junitReporter := reporters.NewJUnitReporter("junit.xml")
+	junitReporter := reporters.NewJUnitReporter("../report/throttle_suite.xml")
 	RunSpecsWithDefaultAndCustomReporters(t, "Throttle Suite", []Reporter{junitReporter})
 }
diff --git a/usagerep/usagerep_suite_test.go b/usagerep/usagerep_suite_test.go
@@ -31,6 +31,6 @@ func init() {
 
 func TestUsagerep(t *testing.T) {
 	RegisterFailHandler(Fail)
-	junitReporter := reporters.NewJUnitReporter("junit.xml")
+	junitReporter := reporters.NewJUnitReporter("../report/usagerep_suite.xml")
 	RunSpecsWithDefaultAndCustomReporters(t, "Usagerep Suite", []Reporter{junitReporter})
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		// This directory is intended to hold the junit XML reports generated by fv and unit tests.