separate concerns

Author: mattfenwick

pkg/connectivity/junit.go

@@ -6,11 +6,14 @@ import (
 	"github.com/sirupsen/logrus"
 	"io"
 	"os"
-	"strconv"
-	"strings"
 )
 
-func PrintJUnitResults(filename string, summary *SummaryTable) {
+type JUnitTestResult struct {
+	Passed bool
+	Name   string
+}
+
+func PrintJUnitResults(filename string, results []*Result, ignoreLoopback bool) {
 	if filename == "" {
 		return
 	}
@@ -21,58 +24,43 @@ func PrintJUnitResults(filename string, summary *SummaryTable) {
 		return
 	}
 
+	var junitResults []*JUnitTestResult
+	for _, result := range results {
+		junitResults = append(junitResults, &JUnitTestResult{
+			Passed: result.Passed(ignoreLoopback),
+			Name:   result.TestCase.Description,
+		})
+	}
+
 	defer f.Close()
-	if err := printJunit(f, summary); err != nil {
+	if err := printJunit(f, junitResults); err != nil {
 		logrus.Errorf("Unable to write junit output: %v\n", err)
 	}
 }
 
-func printJunit(w io.Writer, summary *SummaryTable) error {
-	s := summaryToJunit(summary)
+func printJunit(w io.Writer, results []*JUnitTestResult) error {
+	s := resultsToJUnit(results)
 	enc := xml.NewEncoder(w)
 	enc.Indent("", "    ")
 	return enc.Encode(s)
 }
 
-func summaryToJunit(summary *SummaryTable) junit.JUnitTestSuite {
-	s := junit.JUnitTestSuite{
-		Name:      "cyclonus",
-		Failures:  summary.Failed,
-		TestCases: []junit.JUnitTestCase{},
-	}
+func resultsToJUnit(results []*JUnitTestResult) junit.JUnitTestSuite {
+	var testCases []junit.JUnitTestCase
+	failed := 0
 
-	for _, testStrings := range summary.Tests {
-		_, testName, passed := parseTestStrings(testStrings)
-		// Only cases where the testname are non-empty are new tests, otherwise it
-		// is multi-line output of the test.
-		if testName == "" {
-			continue
+	for _, result := range results {
+		testCase := junit.JUnitTestCase{
+			Name: result.Name,
 		}
-		tc := junit.JUnitTestCase{
-			Name: testName,
+		if !result.Passed {
+			testCase.Failure = &junit.JUnitFailure{}
 		}
-		if !passed {
-			tc.Failure = &junit.JUnitFailure{}
-		}
-		s.TestCases = append(s.TestCases, tc)
-	}
-	return s
-}
-
-func parseTestStrings(input []string) (testNumber int, testName string, passed bool) {
-	split := strings.SplitN(input[0], ": ", 2)
-	if len(split) < 2 {
-		return 0, "", false
-	}
-
-	testNumber, err := strconv.Atoi(split[0])
-	if err != nil {
-		logrus.Errorf("error parsing test number from string %q for junit: %v", split[0], err)
+		testCases = append(testCases, testCase)
 	}
-
-	if len(input) > 1 && input[1] == "passed" {
-		passed = true
+	return junit.JUnitTestSuite{
+		Name:      "cyclonus",
+		Failures:  failed,
+		TestCases: testCases,
 	}
-
-	return testNumber, split[1], passed
 }

pkg/connectivity/printer.go

@@ -33,7 +33,7 @@ func (t *Printer) PrintSummary() {
 
 	fmt.Printf("Feature results:\n%s\n\n", t.printMarkdownFeatureTable(summary.FeaturePrimaryCounts, summary.FeatureCounts))
 	fmt.Printf("Tag results:\n%s\n", t.printMarkdownFeatureTable(summary.TagPrimaryCounts, summary.TagCounts))
-	PrintJUnitResults(t.JunitResultsFile, summary)
+	PrintJUnitResults(t.JunitResultsFile, t.Results, t.IgnoreLoopback)
 }
 
 const (

pkg/connectivity/printer_test.go

@@ -3,9 +3,9 @@ package connectivity
 import (
 	"bytes"
 	"flag"
+	"fmt"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"github.com/sirupsen/logrus"
 	"io/ioutil"
 )
 
@@ -15,36 +15,28 @@ func RunPrinterTests() {
 	Describe("Test junit file print", func() {
 		testCases := []struct {
 			desc       string
-			summary    *SummaryTable
+			results    []*JUnitTestResult
 			expectFile string
 			expectErr  string
 		}{
 			{
 				desc:       "Empty summary",
-				summary:    &SummaryTable{},
+				results:    nil,
 				expectFile: "testdata/empty-summary.golden.xml",
 			}, {
 				desc: "2 pass 2 fail",
-				summary: &SummaryTable{
-					Tests: [][]string{
-						{"1: test1", "passed", ""},
-						{"2: test2 with spaces", "failed", ""},
-						{"3: test3 with + special %chars/", "passed", ""},
-						{"4: test4 with\nnewlines", "foo-is-failed", ""},
-					},
+				results: []*JUnitTestResult{
+					{Name: "test1", Passed: true},
+					{Name: "test2 with spaces", Passed: false},
+					{Name: "test3 with + special %chars/", Passed: true},
+					{Name: "test4 with\nnewlines", Passed: false},
 				},
 				expectFile: "testdata/2-pass-2-fail.golden.xml",
-			}, {
-				desc: "Uses failure count from summary",
-				summary: &SummaryTable{
-					Failed: 10,
-				},
-				expectFile: "testdata/use-summary-failure-count.golden.xml",
 			},
 		}
 		for _, testCase := range testCases {
 			var output bytes.Buffer
-			err := printJunit(&output, testCase.summary)
+			err := printJunit(&output, testCase.results)
 			if err != nil {
 				Expect(len(testCase.expectErr)).ToNot(Equal(0))
 				Expect(err.Error()).To(Equal(testCase.expectErr))
@@ -56,8 +48,8 @@ func RunPrinterTests() {
 			} else {
 				fileData, err := ioutil.ReadFile(testCase.expectFile)
 				Expect(err).To(BeNil())
-				logrus.Infof("expected: \n%s\n", fileData)
-				logrus.Infof("actual: \n%s\n", output.Bytes())
+				fmt.Printf("expected: \n%s\n", fileData)
+				fmt.Printf("actual: \n%s\n", output.Bytes())
 				Expect(bytes.Equal(fileData, output.Bytes())).To(BeTrue())
 			}
 		}

pkg/connectivity/probe/table.go

@@ -47,9 +47,9 @@ func NewTableFromJobResults(resources *Resources, jobResults []*JobResult) *Tabl
 	return table
 }
 
-func (t *Table) Set(from string, to string, value *Item) {
-	t.Wrapped.Set(from, to, value)
-}
+//func (t *Table) Set(from string, to string, value *Item) {
+//	t.Wrapped.Set(from, to, value)
+//}
 
 func (t *Table) Get(from string, to string) *Item {
 	return t.Wrapped.Get(from, to).(*Item)