From 9922c23bd35b82e09a2d2464e3d53f831b07fb96 Mon Sep 17 00:00:00 2001
From: Peter Lacey-Bordeaux <peter@ionicsecurity.com>
Date: Thu, 23 Oct 2014 22:51:59 -0400
Subject: [PATCH 1/2] check for SKIP on the regex and the if condition

---
 parser.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/parser.go b/parser.go
index c5f62eb..f7d9604 100644
--- a/parser.go
+++ b/parser.go
@@ -33,7 +33,7 @@ type Test struct {
 }
 
 var (
-	regexStatus = regexp.MustCompile(`^--- (PASS|FAIL): (.+) \((\d+\.\d+) seconds\)$`)
+	regexStatus = regexp.MustCompile(`^--- (PASS|FAIL|SKIP): (.+) \((\d+\.\d+) seconds\)$`)
 	regexResult = regexp.MustCompile(`^(ok|FAIL)\s+(.+)\s(\d+\.\d+)s$`)
 )
 
@@ -87,7 +87,7 @@ func Parse(r io.Reader) (*Report, error) {
 		} else if test != nil {
 			if matches := regexStatus.FindStringSubmatch(line); len(matches) == 4 {
 				// test status
-				if matches[1] == "PASS" {
+				if matches[1] == "PASS" || matches[1] == "SKIP" {
 					test.Result = PASS
 				} else {
 					test.Result = FAIL

From 5c1ba2f305dffddc358423005426fe280af8f730 Mon Sep 17 00:00:00 2001
From: Peter Lacey-Bordeaux <peter@ionicsecurity.com>
Date: Fri, 24 Oct 2014 08:58:04 -0400
Subject: [PATCH 2/2] identify skipped tests properly with a message

---
 junit-formatter.go | 19 ++++++++++++++-----
 parser.go          |  5 ++++-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/junit-formatter.go b/junit-formatter.go
index f9ea0c1..838fbff 100644
--- a/junit-formatter.go
+++ b/junit-formatter.go
@@ -20,11 +20,16 @@ type JUnitTestSuite struct {
 }
 
 type JUnitTestCase struct {
-	XMLName   xml.Name      `xml:"testcase"`
-	Classname string        `xml:"classname,attr"`
-	Name      string        `xml:"name,attr"`
-	Time      string        `xml:"time,attr"`
-	Failure   *JUnitFailure `xml:"failure,omitempty"`
+	XMLName     xml.Name          `xml:"testcase"`
+	Classname   string            `xml:"classname,attr"`
+	Name        string            `xml:"name,attr"`
+	Time        string            `xml:"time,attr"`
+	SkipMessage *JUnitSkipMessage `xml:"skipped,omitempty"`
+	Failure     *JUnitFailure     `xml:"failure,omitempty"`
+}
+
+type JUnitSkipMessage struct {
+	Message string `xml:"message,attr"`
 }
 
 type JUnitProperty struct {
@@ -88,6 +93,10 @@ func JUnitReportXML(report *Report, w io.Writer) error {
 				}
 			}
 
+			if test.Result == SKIP {
+				testCase.SkipMessage = &JUnitSkipMessage{strings.Join(test.Output, "\n")}
+			}
+
 			ts.TestCases = append(ts.TestCases, testCase)
 		}
 
diff --git a/parser.go b/parser.go
index f7d9604..0fb6aac 100644
--- a/parser.go
+++ b/parser.go
@@ -13,6 +13,7 @@ type Result int
 const (
 	PASS Result = iota
 	FAIL
+	SKIP
 )
 
 type Report struct {
@@ -87,8 +88,10 @@ func Parse(r io.Reader) (*Report, error) {
 		} else if test != nil {
 			if matches := regexStatus.FindStringSubmatch(line); len(matches) == 4 {
 				// test status
-				if matches[1] == "PASS" || matches[1] == "SKIP" {
+				if matches[1] == "PASS" {
 					test.Result = PASS
+				} else if matches[1] == "SKIP" {
+					test.Result = SKIP
 				} else {
 					test.Result = FAIL
 				}