Print gotestsum output for failed reruns

Author: lukaszcl

tools/flakeguard/cmd/run.go

@@ -178,9 +178,16 @@ var RunTestsCmd = &cobra.Command{
 			})
 
 			if len(failedAfterRerun) > 0 {
-				fmt.Println("\nTests That Failed All Reruns:")
+				fmt.Printf("\nTests That Failed All %d Reruns:\n", rerunFailedCount)
 				reports.PrintTestResultsTable(os.Stdout, failedAfterRerun, false, false)
 				fmt.Println()
+
+				fmt.Printf("\nLogs From All Reruns:\n")
+				err := rerunReport.PrintGotestsumOutput("pkgname")
+				if err != nil {
+					log.Error().Err(err).Msg("Error printing gotestsum output")
+				}
+
 				log.Error().
 					Int("noSuccessTests", len(failedAfterRerun)).
 					Int("reruns", rerunFailedCount).

tools/flakeguard/reports/data.go

@@ -1,9 +1,11 @@
 package reports
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"os"
+	"os/exec"
 	"sort"
 	"strings"
 	"time"
@@ -25,6 +27,7 @@ type TestReport struct {
 	SelectedTests        []string     `json:"selected_tests,omitempty"`
 	Results              []TestResult `json:"results,omitempty"`
 	FailedLogsURL        string       `json:"failed_logs_url,omitempty"`
+	JSONOutputPaths      []string     `json:"-"` // go test -json outputs from runs
 	// MaxPassRatio is the maximum flakiness ratio allowed for a test to be considered not flaky
 	MaxPassRatio float64 `json:"max_pass_ratio,omitempty"`
 }
@@ -44,6 +47,25 @@ func (testReport *TestReport) SaveToFile(outputPath string) error {
 	return nil
 }
 
+func (tr *TestReport) PrintGotestsumOutput(format string) error {
+	for _, path := range tr.JSONOutputPaths {
+		cmdStr := fmt.Sprintf("cat %q | gotestsum --raw-command --format %q -- cat", path, format)
+		cmd := exec.Command("bash", "-c", cmdStr)
+
+		var outBuf bytes.Buffer
+		cmd.Stdout = &outBuf
+		cmd.Stderr = &outBuf
+
+		if err := cmd.Run(); err != nil {
+			return fmt.Errorf("gotestsum command failed for file %s: %w\nOutput: %s", path, err, outBuf.String())
+		}
+
+		fmt.Print(outBuf.String())
+		fmt.Println("---------------------")
+	}
+	return nil
+}
+
 // GenerateSummaryData generates a summary of a report's test results
 func (testReport *TestReport) GenerateSummaryData() {
 	var runs, testRunCount, passes, fails, skips, panickedTests, racedTests, flakyTests int

tools/flakeguard/runner/runner.go

@@ -543,9 +543,9 @@ func (r *Runner) parseTestResults(filePaths []string, runPrefix string, runCount
 		if err = file.Close(); err != nil {
 			log.Warn().Err(err).Str("file", filePath).Msg("failed to close file")
 		}
-		if err = os.Remove(filePath); err != nil {
-			log.Warn().Err(err).Str("file", filePath).Msg("failed to delete file")
-		}
+		// if err = os.Remove(filePath); err != nil {
+		// 	log.Warn().Err(err).Str("file", filePath).Msg("failed to delete file")
+		// }
 	}
 
 	var results []reports.TestResult
@@ -778,12 +778,13 @@ func (r *Runner) RerunFailedTests(failedTests []reports.TestResult) (*reports.Te
 	}
 
 	report := &reports.TestReport{
-		GoProject:     r.prettyProjectPath,
-		RaceDetection: r.UseRace,
-		ExcludedTests: r.SkipTests,
-		SelectedTests: r.SelectTests,
-		Results:       rerunResults,
-		MaxPassRatio:  r.MaxPassRatio,
+		GoProject:       r.prettyProjectPath,
+		RaceDetection:   r.UseRace,
+		ExcludedTests:   r.SkipTests,
+		SelectedTests:   r.SelectTests,
+		Results:         rerunResults,
+		MaxPassRatio:    r.MaxPassRatio,
+		JSONOutputPaths: rerunJsonFilePaths,
 	}
 	report.GenerateSummaryData()