Add skip reason and link

Author: ycombinator

internal/testrunner/reporters/formats/human.go

@@ -36,8 +36,8 @@ func reportHumanFormat(results []testrunner.TestResult) (string, error) {
 			result = fmt.Sprintf("ERROR: %s", r.ErrorMsg)
 		} else if r.FailureMsg != "" {
 			result = fmt.Sprintf("FAIL: %s", r.FailureMsg)
-		} else if r.Skipped {
-			result = "SKIPPED"
+		} else if r.Skipped != nil {
+			result = r.Skipped.String()
 		} else {
 			result = "PASS"
 		}

internal/testrunner/reporters/formats/xunit.go

@@ -85,7 +85,7 @@ func reportXUnitFormat(results []testrunner.TestResult) (string, error) {
 			numErrors++
 		}
 
-		if r.Skipped {
+		if r.Skipped != nil {
 			numSkipped++
 		}
 
@@ -102,8 +102,8 @@ func reportXUnitFormat(results []testrunner.TestResult) (string, error) {
 			Failure:       failure,
 		}
 
-		if r.Skipped {
-			c.Skipped = &skipped{""} // TODO: include reason?
+		if r.Skipped != nil {
+			c.Skipped = &skipped{r.Skipped.String()}
 		}
 
 		numTests++

internal/testrunner/runners/asset/runner.go

@@ -81,7 +81,7 @@ func (r *runner) run() ([]testrunner.TestResult, error) {
 		logger.Warnf("skipping %s test for %s: %s (details: %s)",
 			TestType, r.testFolder.Package,
 			testConfig.Skip.Reason, testConfig.Skip.Link.String())
-		return result.WithSkip()
+		return result.WithSkip(testConfig.Skip)
 	}
 
 	pkgManifest, err := packages.ReadPackageManifest(filepath.Join(r.packageRootPath, packages.PackageManifestFile))

internal/testrunner/runners/pipeline/runner.go

@@ -112,7 +112,7 @@ func (r *runner) run() ([]testrunner.TestResult, error) {
 				TestType, r.options.TestFolder.Package, r.options.TestFolder.DataStream,
 				tc.config.Skip.Reason, tc.config.Skip.Link.String())
 
-			tr.Skipped = true
+			tr.Skipped = tc.config.Skip
 			results = append(results, tr)
 			continue
 		}

internal/testrunner/runners/system/runner.go

@@ -146,7 +146,7 @@ func (r *runner) run() (results []testrunner.TestResult, err error) {
 				TestType, r.options.TestFolder.Package, r.options.TestFolder.DataStream,
 				testConfig.Skip.Reason, testConfig.Skip.Link.String())
 			result := r.newResult(testConfig.Name())
-			partial, err = result.WithSkip()
+			partial, err = result.WithSkip(testConfig.Skip)
 		}
 
 		results = append(results, partial...)

internal/testrunner/test_config.go

@@ -4,10 +4,17 @@
 
 package testrunner
 
-import "net/url"
+import (
+	"fmt"
+	"net/url"
+)
 
 // SkipConfig allows a test to be marked as skipped
 type SkipConfig struct {
 	Reason string  `config:"reason"`
 	Link   url.URL `config:"url"`
 }
+
+func (s SkipConfig) String() string {
+	return fmt.Sprintf("%s [%s]", s.Reason, s.Link.String())
+}

internal/testrunner/testrunner.go

@@ -81,8 +81,9 @@ type TestResult struct {
 	// to an unexpected runtime error in the test execution.
 	ErrorMsg string
 
-	// Flag to indicate that test was skipped.
-	Skipped bool
+	// If the test was skipped, the reason it was skipped and a link for more
+	// details.
+	Skipped *SkipConfig
 }
 
 // ResultComposer wraps a TestResult and provides convenience methods for
@@ -115,8 +116,8 @@ func (rc *ResultComposer) WithSuccess() ([]TestResult, error) {
 }
 
 // WithSkip marks the test result wrapped by ResultComposer as skipped.
-func (rc *ResultComposer) WithSkip() ([]TestResult, error) {
-	rc.TestResult.Skipped = true
+func (rc *ResultComposer) WithSkip(s *SkipConfig) ([]TestResult, error) {
+	rc.TestResult.Skipped = s
 	return rc.WithError(nil)
 }