fix

Author: lukaszcl

tools/flakeguard/cmd/generate_report.go

@@ -39,7 +39,7 @@ var GenerateReportCmd = &cobra.Command{
 		s.Suffix = " Loading aggregated test report..."
 		s.Start()
 
-		aggregatedReport := &reports.TestReport{}
+		aggregatedReport := reports.TestReport{}
 		reportFile, err := os.Open(aggregatedResultsPath)
 		if err != nil {
 			s.Stop()
@@ -166,7 +166,7 @@ func init() {
 	}
 }
 
-func generateGitHubSummaryMarkdown(report *reports.TestReport, outputPath, artifactLink, artifactName string) error {
+func generateGitHubSummaryMarkdown(report reports.TestReport, outputPath, artifactLink, artifactName string) error {
 	fs := reports.OSFileSystem{}
 	mdFileName := outputPath + "-summary.md"
 	mdFile, err := fs.Create(mdFileName)
@@ -182,7 +182,7 @@ func generateGitHubSummaryMarkdown(report *reports.TestReport, outputPath, artif
 }
 
 func generatePRCommentMarkdown(
-	report *reports.TestReport,
+	report reports.TestReport,
 	outputPath,
 	baseBranch,
 	currentBranch,

tools/flakeguard/cmd/run.go

@@ -138,8 +138,9 @@ var RunTestsCmd = &cobra.Command{
 			return
 		}
 
-		fmt.Printf("\nFlakeguard Initial Summary:\n")
-		reports.RenderResults(os.Stdout, mainReport, false, false)
+		fmt.Printf("\nFlakeguard Main Summary:\n")
+		reports.RenderResults(os.Stdout, *mainReport, false, false)
+		fmt.Println()
 
 		// Rerun failed tests
 		if rerunFailed > 0 {
@@ -154,15 +155,16 @@ var RunTestsCmd = &cobra.Command{
 				return !tr.Skipped && tr.Successes == 0
 			})
 			fmt.Printf("\nFlakeguard Rerun Summary:\n")
-			reports.RenderResults(os.Stdout, rerunReport, false, false)
+			reports.PrintTestTable(os.Stdout, *rerunReport, false, false)
+			fmt.Println()
 
 			// Save the rerun test report to file
-			if rerunReportPath != "" && len(mainReport.Results) > 0 {
+			if rerunReportPath != "" && len(rerunReport.Results) > 0 {
 				if err := rerunReport.SaveToFile(rerunReportPath); err != nil {
 					log.Error().Err(err).Msg("Error saving test results to file")
 					os.Exit(ErrorExitCode)
 				}
-				log.Info().Str("path", rerunReportPath).Msg("Main test report saved")
+				log.Info().Str("path", rerunReportPath).Msg("Rerun test report saved")
 			}
 
 			if len(failedAfterRerun) > 0 {
@@ -172,7 +174,7 @@ var RunTestsCmd = &cobra.Command{
 					Msg("Tests still failing after reruns with 0 successes")
 				os.Exit(ErrorExitCode)
 			} else {
-				log.Info().Msg("Failed tests passed at least once after reruns")
+				log.Info().Msg("Tests that failed passed at least once after reruns")
 				os.Exit(0)
 			}
 		} else {

tools/flakeguard/reports/presentation.go

@@ -10,10 +10,11 @@ import (
 	"golang.org/x/text/message"
 )
 
-// GenerateFlakyTestsTable generates a table of flaky tests from the given test report to print to the console or markdown.
-func GenerateFlakyTestsTable(
-	testReport *TestReport,
+// generateTestTable is a helper that builds the table based on the given filter function.
+func generateTestTable(
+	testReport TestReport,
 	markdown bool,
+	filter func(result TestResult) bool,
 ) [][]string {
 	p := message.NewPrinter(language.English)
 
@@ -45,8 +46,7 @@ func GenerateFlakyTestsTable(
 	table := [][]string{headers}
 
 	for _, result := range testReport.Results {
-		// Exclude skipped tests and only include tests below the expected pass ratio
-		if !result.Skipped && result.PassRatio < testReport.MaxPassRatio {
+		if filter(result) {
 			row := []string{
 				result.TestName,
 				formatRatio(result.PassRatio),
@@ -75,8 +75,30 @@ func GenerateFlakyTestsTable(
 	return table
 }
 
+// GenerateFlakyTestsTable returns a table with only the flaky tests.
+func GenerateFlakyTestsTable(
+	testReport TestReport,
+	markdown bool,
+) [][]string {
+	return generateTestTable(testReport, markdown, func(result TestResult) bool {
+		return !result.Skipped && result.PassRatio < testReport.MaxPassRatio
+	})
+}
+
+// PrintTestTable prints a table with all test results.
+func PrintTestTable(
+	w io.Writer,
+	testReport TestReport,
+	markdown bool,
+	collapsible bool) {
+	table := generateTestTable(testReport, markdown, func(result TestResult) bool {
+		return true // Include all tests
+	})
+	printTable(w, table, collapsible)
+}
+
 // GenerateGitHubSummaryMarkdown generates a markdown summary of the test results for a GitHub workflow summary
-func GenerateGitHubSummaryMarkdown(w io.Writer, testReport *TestReport, maxPassRatio float64, artifactName, artifactLink string) {
+func GenerateGitHubSummaryMarkdown(w io.Writer, testReport TestReport, maxPassRatio float64, artifactName, artifactLink string) {
 	fmt.Fprint(w, "# Flakeguard Summary\n\n")
 
 	if len(testReport.Results) == 0 {
@@ -109,7 +131,7 @@ func GenerateGitHubSummaryMarkdown(w io.Writer, testReport *TestReport, maxPassR
 // GeneratePRCommentMarkdown generates a markdown summary of the test results for a GitHub PR comment.
 func GeneratePRCommentMarkdown(
 	w io.Writer,
-	testReport *TestReport,
+	testReport TestReport,
 	maxPassRatio float64,
 	baseBranch, currentBranch, currentCommitSHA, repoURL, actionRunID, artifactName, artifactLink string,
 ) {
@@ -156,7 +178,7 @@ func GeneratePRCommentMarkdown(
 	}
 }
 
-func buildSettingsTable(testReport *TestReport, maxPassRatio float64) [][]string {
+func buildSettingsTable(testReport TestReport, maxPassRatio float64) [][]string {
 	rows := [][]string{
 		{"**Setting**", "**Value**"},
 	}
@@ -190,7 +212,7 @@ func RenderError(
 // If in markdown mode, the table results can also be made collapsible.
 func RenderResults(
 	w io.Writer,
-	testReport *TestReport,
+	testReport TestReport,
 	markdown bool,
 	collapsible bool,
 ) {

tools/flakeguard/runner/example_test_package/example_tests_test.go

@@ -218,8 +218,6 @@ func TestTimeout(t *testing.T) {
 func TestRandomFlaky(t *testing.T) {
 	t.Parallel()
 
-	time.Sleep(100 * time.Millisecond)
-
 	// Seed random number generator with current time
 	seed := time.Now().UnixNano()
 	t.Logf("Using seed: %d", seed)