Refactor and update flag names

Author: lukaszcl

tools/flakeguard/cmd/run.go

@@ -30,6 +30,7 @@ var RunTestsCmd = &cobra.Command{
 		testPackagesArg, _ := cmd.Flags().GetStringSlice("test-packages")
 		testCmdStrings, _ := cmd.Flags().GetStringArray("test-cmd")
 		runCount, _ := cmd.Flags().GetInt("run-count")
+		rerunFailedCount, _ := cmd.Flags().GetInt("rerun-failed-count")
 		timeout, _ := cmd.Flags().GetDuration("timeout")
 		tags, _ := cmd.Flags().GetStringArray("tags")
 		useRace, _ := cmd.Flags().GetBool("race")
@@ -45,7 +46,6 @@ var RunTestsCmd = &cobra.Command{
 		shuffleSeed, _ := cmd.Flags().GetString("shuffle-seed")
 		omitOutputsOnSuccess, _ := cmd.Flags().GetBool("omit-test-outputs-on-success")
 		ignoreParentFailuresOnSubtests, _ := cmd.Flags().GetBool("ignore-parent-failures-on-subtests")
-		rerunFailed, _ := cmd.Flags().GetInt("rerun-failed")
 		failFast, _ := cmd.Flags().GetBool("fail-fast")
 
 		// Handle the compatibility between min/max pass ratio
@@ -99,7 +99,7 @@ var RunTestsCmd = &cobra.Command{
 			OmitOutputsOnSuccess:           omitOutputsOnSuccess,
 			MaxPassRatio:                   passRatioThreshold, // Use the calculated threshold
 			IgnoreParentFailuresOnSubtests: ignoreParentFailuresOnSubtests,
-			RerunFailed:                    rerunFailed,
+			RerunCount:                     rerunFailedCount,
 			FailFast:                       failFast,
 		}
 
@@ -143,7 +143,7 @@ var RunTestsCmd = &cobra.Command{
 		fmt.Println()
 
 		// Rerun failed tests
-		if rerunFailed > 0 {
+		if rerunFailedCount > 0 {
 			rerunReport, err = testRunner.RerunFailedTests(mainReport.Results)
 			if err != nil {
 				log.Fatal().Err(err).Msg("Error rerunning failed tests")
@@ -170,7 +170,7 @@ var RunTestsCmd = &cobra.Command{
 			if len(failedAfterRerun) > 0 {
 				log.Error().
 					Int("tests", len(failedAfterRerun)).
-					Int("reruns", rerunFailed).
+					Int("reruns", rerunFailedCount).
 					Msg("Tests still failing after reruns with 0 successes")
 				os.Exit(ErrorExitCode)
 			} else {
@@ -227,7 +227,7 @@ func init() {
 	RunTestsCmd.Flags().Bool("ignore-parent-failures-on-subtests", false, "Ignore failures in parent tests when only subtests fail")
 
 	// Add rerun failed tests flag
-	RunTestsCmd.Flags().Int("rerun-failed", 0, "Number of times to rerun failed tests (0 disables reruns)")
+	RunTestsCmd.Flags().Int("rerun-failed-count", 0, "Number of times to rerun failed tests (0 disables reruns)")
 }
 
 func checkDependencies(projectPath string) error {

tools/flakeguard/runner/runner.go

@@ -31,13 +31,13 @@ type Runner struct {
 	prettyProjectPath              string        // Go project package path, formatted for pretty printing.
 	Verbose                        bool          // If true, provides detailed logging.
 	RunCount                       int           // Number of times to run the tests.
+	RerunCount                     int           // Number of additional runs for tests that initially fail.
 	UseRace                        bool          // Enable race detector.
 	Timeout                        time.Duration // Test timeout
 	Tags                           []string      // Build tags.
 	UseShuffle                     bool          // Enable test shuffling. -shuffle=on flag.
 	ShuffleSeed                    string        // Set seed for test shuffling -shuffle={seed} flag. Must be used with UseShuffle.
 	FailFast                       bool          // Stop on first test failure.
-	RerunFailed                    int           // Number of additional runs for tests that initially fail.
 	SkipTests                      []string      // Test names to exclude.
 	SelectTests                    []string      // Test names to include.
 	CollectRawOutput               bool          // Set to true to collect test output for later inspection.
@@ -77,22 +77,11 @@ func (r *Runner) RunTestPackages(packages []string) (*reports.TestReport, error)
 	}
 
 	// Parse initial results.
-	results, err := r.parseTestResults(jsonFilePaths, "run")
+	results, err := r.parseTestResults(jsonFilePaths, "run", r.RunCount)
 	if err != nil {
 		return nil, fmt.Errorf("failed to parse test results: %w", err)
 	}
 
-	// Rerun failing tests (only the unique tests).
-	// if r.RerunFailed > 0 {
-	// 	rerunResults, err := r.rerunFailedTests(results)
-	// 	if err != nil {
-	// 		return nil, fmt.Errorf("failed to rerun failing tests: %w", err)
-	// 	}
-
-	// 	// Merge rerun results with initial results.
-	// 	mergeTestResults(&results, rerunResults)
-	// }
-
 	report := &reports.TestReport{
 		GoProject:     r.prettyProjectPath,
 		RaceDetection: r.UseRace,
@@ -124,7 +113,7 @@ func (r *Runner) RunTestCmd(testCmd []string) (*reports.TestReport, error) {
 		}
 	}
 
-	results, err := r.parseTestResults(jsonFilePaths, "run")
+	results, err := r.parseTestResults(jsonFilePaths, "run", r.RunCount)
 	if err != nil {
 		return nil, fmt.Errorf("failed to parse test results: %w", err)
 	}
@@ -229,10 +218,6 @@ func (r *Runner) runCmd(testCmd []string, runIndex int) (tempFilePath string, pa
 	}
 	defer tmpFile.Close()
 
-	if r.Verbose {
-		log.Info().Msgf("Running custom test command (%d/%d): %s", runIndex+1, r.RunCount, strings.Join(testCmd, " "))
-	}
-
 	cmd := exec.Command(testCmd[0], testCmd[1:]...)
 	cmd.Dir = r.ProjectPath
 
@@ -300,7 +285,7 @@ func (e entry) String() string {
 // panics and failures at that point.
 // Subtests add more complexity, as panics in subtests are only reported in their parent's output,
 // and cannot be accurately attributed to the subtest that caused them.
-func (r *Runner) parseTestResults(filePaths []string, runPrefix string) ([]reports.TestResult, error) {
+func (r *Runner) parseTestResults(filePaths []string, runPrefix string, runCount int) ([]reports.TestResult, error) {
 	// If the option is enabled, transform each JSON output file before parsing.
 	if r.IgnoreParentFailuresOnSubtests {
 		transformedPaths, err := r.transformTestOutputFiles(filePaths)
@@ -319,7 +304,7 @@ func (r *Runner) parseTestResults(filePaths []string, runPrefix string) ([]repor
 		panicDetectionMode  = false
 		raceDetectionMode   = false
 		detectedEntries     = []entry{} // race or panic entries
-		expectedRuns        = r.RunCount
+		expectedRuns        = runCount
 	)
 
 	runNumber := 0
@@ -755,7 +740,7 @@ func (r *Runner) RerunFailedTests(results []reports.TestResult) (*reports.TestRe
 	var rerunJsonFilePaths []string
 
 	// Rerun each failing test package up to RerunFailed times
-	for i := range r.RerunFailed {
+	for i := range r.RerunCount {
 		for pkg, tests := range failingTestsByPackage {
 			// Build regex pattern to match all failing tests in this package
 			testPattern := fmt.Sprintf("^(%s)$", strings.Join(tests, "|"))
@@ -794,7 +779,7 @@ func (r *Runner) RerunFailedTests(results []reports.TestResult) (*reports.TestRe
 	}
 
 	// Parse all rerun results at once with a consistent prefix
-	rerunResults, err := r.parseTestResults(rerunJsonFilePaths, "rerun")
+	rerunResults, err := r.parseTestResults(rerunJsonFilePaths, "rerun", r.RerunCount)
 	if err != nil {
 		return nil, fmt.Errorf("failed to parse rerun results: %w", err)
 	}

tools/flakeguard/runner/runner_test.go

@@ -545,7 +545,7 @@ func TestRerunFailed(t *testing.T) {
 		ProjectPath:      "./",
 		Verbose:          true,
 		RunCount:         2,                    // Run tests twice initially
-		RerunFailed:      3,                    // Rerun failing tests 3 more times
+		RerunCount:       3,                    // Rerun failing tests 3 more times
 		SelectTests:      []string{"TestFail"}, // This test is known to always fail
 		CollectRawOutput: true,
 	}