Skip to content

Commit 6e98257

Browse files
mattfenwickmattfenwick
authored
Merge pull request #116 from mattfenwick/ginkgo
migrate tests into ginkgo framework
2 parents 920e568 + a2b7cb0 commit 6e98257

10 files changed

+232
-248
lines changed

‎pkg/connectivity/junit.go

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
package connectivity
2+
3+
import (
4+
"encoding/xml"
5+
junit "github.com/jstemmer/go-junit-report/formatter"
6+
"github.com/sirupsen/logrus"
7+
"os"
8+
)
9+
10+
type JUnitTestResult struct {
11+
Passed bool
12+
Name string
13+
}
14+
15+
func PrintJUnitResults(filename string, results []*Result, ignoreLoopback bool) error {
16+
if filename == "" {
17+
return nil
18+
}
19+
20+
var junitResults []*JUnitTestResult
21+
for _, result := range results {
22+
junitResults = append(junitResults, &JUnitTestResult{
23+
Passed: result.Passed(ignoreLoopback),
24+
Name: result.TestCase.Description,
25+
})
26+
}
27+
28+
f, err := os.Create(filename)
29+
if err != nil {
30+
logrus.Errorf("Unable to create file %q for junit output: %v\n", filename, err)
31+
return err
32+
}
33+
defer f.Close()
34+
35+
junitTestSuite := ResultsToJUnit(junitResults)
36+
enc := xml.NewEncoder(f)
37+
enc.Indent("", " ")
38+
return enc.Encode(junitTestSuite)
39+
}
40+
41+
func ResultsToJUnit(results []*JUnitTestResult) junit.JUnitTestSuite {
42+
var testCases []junit.JUnitTestCase
43+
failed := 0
44+
45+
for _, result := range results {
46+
testCase := junit.JUnitTestCase{
47+
Name: result.Name,
48+
}
49+
if !result.Passed {
50+
testCase.Failure = &junit.JUnitFailure{}
51+
failed++
52+
}
53+
testCases = append(testCases, testCase)
54+
}
55+
return junit.JUnitTestSuite{
56+
Name: "cyclonus",
57+
Failures: failed,
58+
TestCases: testCases,
59+
}
60+
}

‎pkg/connectivity/printer.go

+5-66
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
11
package connectivity
22

33
import (
4-
"encoding/xml"
54
"fmt"
6-
"io"
5+
log "github.com/sirupsen/logrus"
76
"math"
8-
"os"
97
"sort"
10-
"strconv"
118
"strings"
129

13-
junit "github.com/jstemmer/go-junit-report/formatter"
1410
"github.com/mattfenwick/cyclonus/pkg/generator"
1511
"github.com/mattfenwick/cyclonus/pkg/utils"
1612
"github.com/olekukonko/tablewriter"
1713
"github.com/pkg/errors"
18-
"github.com/sirupsen/logrus"
1914
v1 "k8s.io/api/core/v1"
2015
networkingv1 "k8s.io/api/networking/v1"
2116
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -30,7 +25,7 @@ type Printer struct {
3025
}
3126

3227
func (t *Printer) PrintSummary() {
33-
summary := (&CombinedResults{Results: t.Results}).Summary(t.IgnoreLoopback)
28+
summary := NewSummaryTableFromResults(t.IgnoreLoopback, t.Results)
3429
t.printTestSummary(summary.Tests)
3530
for primary, counts := range summary.TagCounts {
3631
fmt.Println(passFailTable(primary, counts, nil, nil))
@@ -39,66 +34,10 @@ func (t *Printer) PrintSummary() {
3934

4035
fmt.Printf("Feature results:\n%s\n\n", t.printMarkdownFeatureTable(summary.FeaturePrimaryCounts, summary.FeatureCounts))
4136
fmt.Printf("Tag results:\n%s\n", t.printMarkdownFeatureTable(summary.TagPrimaryCounts, summary.TagCounts))
42-
if t.JunitResultsFile != "" {
43-
f, err := os.Create(t.JunitResultsFile)
44-
if err != nil {
45-
logrus.Errorf("Unable to create file %q for junit output: %v\n", t.JunitResultsFile, err)
46-
} else {
47-
defer f.Close()
48-
if err := printJunit(f, summary); err != nil {
49-
logrus.Errorf("Unable to write junit output: %v\n", err)
50-
}
51-
}
52-
}
53-
}
54-
55-
func printJunit(w io.Writer, summary *Summary) error {
56-
s := summaryToJunit(summary)
57-
enc := xml.NewEncoder(w)
58-
return enc.Encode(s)
59-
}
60-
61-
func summaryToJunit(summary *Summary) junit.JUnitTestSuite {
62-
s := junit.JUnitTestSuite{
63-
Name: "cyclonus",
64-
Failures: summary.Failed,
65-
TestCases: []junit.JUnitTestCase{},
66-
}
67-
68-
for _, testStrings := range summary.Tests {
69-
_, testName, passed := parseTestStrings(testStrings)
70-
// Only cases where the testname are non-empty are new tests, otherwise it
71-
// is multi-line output of the test.
72-
if testName == "" {
73-
continue
74-
}
75-
tc := junit.JUnitTestCase{
76-
Name: testName,
77-
}
78-
if !passed {
79-
tc.Failure = &junit.JUnitFailure{}
80-
}
81-
s.TestCases = append(s.TestCases, tc)
82-
}
83-
return s
84-
}
8537

86-
func parseTestStrings(input []string) (testNumber int, testName string, passed bool) {
87-
split := strings.SplitN(input[0], ": ", 2)
88-
if len(split) < 2 {
89-
return 0, "", false
38+
if err := PrintJUnitResults(t.JunitResultsFile, t.Results, t.IgnoreLoopback); err != nil {
39+
log.Errorf("unable to dump JUnit test results: %+v", err)
9040
}
91-
92-
testNumber, err := strconv.Atoi(split[0])
93-
if err != nil {
94-
logrus.Errorf("error parsing test number from string %q for junit: %v", split[0], err)
95-
}
96-
97-
if len(input) > 1 && input[1] == "passed" {
98-
passed = true
99-
}
100-
101-
return testNumber, split[1], passed
10241
}
10342

10443
const (
@@ -168,7 +107,7 @@ func (t *Printer) printMarkdownFeatureTable(primaryCounts map[string]map[bool]in
168107

169108
func (t *Printer) printTestSummary(rows [][]string) {
170109
tableString := &strings.Builder{}
171-
tableString.WriteString("Summary:\n")
110+
tableString.WriteString("SummaryTable:\n")
172111
table := tablewriter.NewWriter(tableString)
173112
table.SetRowLine(true)
174113

‎pkg/connectivity/printer_test.go

+41-58
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,51 @@
11
package connectivity
22

33
import (
4-
"bytes"
5-
"flag"
6-
"io/ioutil"
7-
"testing"
4+
junit "github.com/jstemmer/go-junit-report/formatter"
5+
. "github.com/onsi/ginkgo"
6+
. "github.com/onsi/gomega"
87
)
98

10-
var update = flag.Bool("update", false, "update .golden files")
11-
12-
func TestPrintJunit(t *testing.T) {
13-
testCases := []struct {
14-
desc string
15-
summary *Summary
16-
expectFile string
17-
expectErr string
18-
}{
19-
{
20-
desc: "Empty summary",
21-
summary: &Summary{},
22-
expectFile: "testdata/empty-summary.golden.xml",
23-
}, {
24-
desc: "2 pass 2 fail",
25-
summary: &Summary{
26-
Tests: [][]string{
27-
{"1: test1", "passed", ""},
28-
{"2: test2 with spaces", "failed", ""},
29-
{"3: test3 with + special %chars/", "passed", ""},
30-
{"4: test4 with\nnewlines", "foo-is-failed", ""},
9+
func RunPrinterTests() {
10+
Describe("JUnit cyclonus output", func() {
11+
It("should convert results to junit", func() {
12+
testCases := []struct {
13+
desc string
14+
results []*JUnitTestResult
15+
junit junit.JUnitTestSuite
16+
}{
17+
{
18+
desc: "Empty summary",
19+
results: nil,
20+
junit: junit.JUnitTestSuite{
21+
Failures: 0,
22+
Name: "cyclonus",
23+
TestCases: nil,
24+
},
25+
}, {
26+
desc: "2 pass 2 fail",
27+
results: []*JUnitTestResult{
28+
{Name: "test1", Passed: true},
29+
{Name: "test2 with spaces", Passed: false},
30+
{Name: "test3 with + special %chars/", Passed: true},
31+
{Name: "test4 with\nnewlines", Passed: false},
32+
},
33+
junit: junit.JUnitTestSuite{
34+
Failures: 2,
35+
Name: "cyclonus",
36+
TestCases: []junit.JUnitTestCase{
37+
{Name: "test1", Failure: nil},
38+
{Name: "test2 with spaces", Failure: &junit.JUnitFailure{}},
39+
{Name: "test3 with + special %chars/", Failure: nil},
40+
{Name: "test4 with\nnewlines", Failure: &junit.JUnitFailure{}},
41+
},
42+
},
3143
},
32-
},
33-
expectFile: "testdata/2-pass-2-fail.golden.xml",
34-
}, {
35-
desc: "Uses failure count from summary",
36-
summary: &Summary{
37-
Failed: 10,
38-
},
39-
expectFile: "testdata/use-summary-failure-count.golden.xml",
40-
},
41-
}
42-
for _, tC := range testCases {
43-
t.Run(tC.desc, func(t *testing.T) {
44-
var output bytes.Buffer
45-
err := printJunit(&output, tC.summary)
46-
if err != nil {
47-
if len(tC.expectErr) == 0 {
48-
t.Fatalf("Expected nil error but got %v", err)
49-
}
50-
if err.Error() != tC.expectErr {
51-
t.Fatalf("Expected error %q but got %q", err, tC.expectErr)
52-
}
5344
}
54-
55-
if *update {
56-
ioutil.WriteFile(tC.expectFile, output.Bytes(), 0666)
57-
} else {
58-
fileData, err := ioutil.ReadFile(tC.expectFile)
59-
if err != nil {
60-
t.Fatalf("Failed to read golden file %v: %v", tC.expectFile, err)
61-
}
62-
if !bytes.Equal(fileData, output.Bytes()) {
63-
t.Errorf("Expected junit to equal goldenfile: %v but instead got:\n\n%v", tC.expectFile, output.String())
64-
}
45+
for _, testCase := range testCases {
46+
actual := ResultsToJUnit(testCase.results)
47+
Expect(actual).To(Equal(testCase.junit))
6548
}
6649
})
67-
}
50+
})
6851
}

‎pkg/connectivity/probe/table.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ func NewTableFromJobResults(resources *Resources, jobResults []*JobResult) *Tabl
4747
return table
4848
}
4949

50-
func (t *Table) Set(from string, to string, value *Item) {
51-
t.Wrapped.Set(from, to, value)
52-
}
50+
//func (t *Table) Set(from string, to string, value *Item) {
51+
// t.Wrapped.Set(from, to, value)
52+
//}
5353

5454
func (t *Table) Get(from string, to string) *Item {
5555
return t.Wrapped.Get(from, to).(*Item)

0 commit comments

Comments
 (0)