Add go-test-count flag to test runner

Author: lukaszcl

tools/flakeguard/cmd/run.go

@@ -57,6 +57,17 @@ var RunTestsCmd = &cobra.Command{
 		ignoreParentFailuresOnSubtests, _ := cmd.Flags().GetBool("ignore-parent-failures-on-subtests")
 		failFast, _ := cmd.Flags().GetBool("fail-fast")
 
+		// Retrieve go-test-count flag as a pointer if explicitly provided.
+		var goTestCount *int
+		if cmd.Flags().Changed("go-test-count") {
+			v, err := cmd.Flags().GetInt("go-test-count")
+			if err != nil {
+				log.Error().Err(err).Msg("Error retrieving flag go-test-count")
+				flushSummaryAndExit(ErrorExitCode)
+			}
+			goTestCount = &v
+		}
+
 		// Handle the compatibility between min/max pass ratio
 		passRatioThreshold := minPassRatio
 		if maxPassRatioSpecified && maxPassRatio != 1.0 {
@@ -100,7 +111,8 @@ var RunTestsCmd = &cobra.Command{
 			RunCount:                       runCount,
 			Timeout:                        timeout,
 			Tags:                           tags,
-			UseRace:                        useRace,
+			GoTestCountFlag:                goTestCount,
+			GoTestRaceFlag:                 useRace,
 			SkipTests:                      skipTests,
 			SelectTests:                    selectTests,
 			UseShuffle:                     useShuffle,
@@ -243,6 +255,7 @@ func init() {
 	RunTestsCmd.Flags().IntP("run-count", "c", 1, "Number of times to run the tests")
 	RunTestsCmd.Flags().Duration("timeout", 0, "Passed on to the 'go test' command as the -timeout flag")
 	RunTestsCmd.Flags().StringArray("tags", nil, "Passed on to the 'go test' command as the -tags flag")
+	RunTestsCmd.Flags().Int("go-test-count", -1, "go test -count flag value. By default -count flag is not passed to go test")
 	RunTestsCmd.Flags().Bool("race", false, "Enable the race detector")
 	RunTestsCmd.Flags().Bool("shuffle", false, "Enable test shuffling")
 	RunTestsCmd.Flags().String("shuffle-seed", "", "Set seed for test shuffling. Must be used with --shuffle")

tools/flakeguard/runner/runner.go

@@ -32,7 +32,8 @@ type Runner struct {
 	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.
+	GoTestCountFlag                *int          // Run go test with -count flag.
+	GoTestRaceFlag                 bool          // Run go test with -race flag.
 	Timeout                        time.Duration // Test timeout
 	Tags                           []string      // Build tags.
 	UseShuffle                     bool          // Enable test shuffling. -shuffle=on flag.
@@ -84,7 +85,7 @@ func (r *Runner) RunTestPackages(packages []string) (*reports.TestReport, error)
 
 	report := &reports.TestReport{
 		GoProject:     r.prettyProjectPath,
-		RaceDetection: r.UseRace,
+		RaceDetection: r.GoTestRaceFlag,
 		ExcludedTests: r.SkipTests,
 		SelectedTests: r.SelectTests,
 		Results:       results,
@@ -120,7 +121,7 @@ func (r *Runner) RunTestCmd(testCmd []string) (*reports.TestReport, error) {
 
 	report := &reports.TestReport{
 		GoProject:     r.prettyProjectPath,
-		RaceDetection: r.UseRace,
+		RaceDetection: r.GoTestRaceFlag,
 		ExcludedTests: r.SkipTests,
 		SelectedTests: r.SelectTests,
 		Results:       results,
@@ -143,8 +144,11 @@ type exitCoder interface {
 
 // runTestPackage runs the tests for a given package and returns the path to the output file.
 func (r *Runner) runTestPackage(packageName string) (string, bool, error) {
-	args := []string{"test", packageName, "-json", "-count=1"}
-	if r.UseRace {
+	args := []string{"test", packageName, "-json"}
+	if r.GoTestCountFlag != nil {
+		args = append(args, fmt.Sprintf("-count=%d", *r.GoTestCountFlag))
+	}
+	if r.GoTestRaceFlag {
 		args = append(args, "-race")
 	}
 	if r.Timeout > 0 {
@@ -748,7 +752,7 @@ func (r *Runner) RerunFailedTests(failedTests []reports.TestResult) (*reports.Te
 			}
 
 			// Add other test flags
-			if r.UseRace {
+			if r.GoTestRaceFlag {
 				cmd = append(cmd, "-race")
 			}
 			if r.Timeout > 0 {
@@ -779,7 +783,7 @@ func (r *Runner) RerunFailedTests(failedTests []reports.TestResult) (*reports.Te
 
 	report := &reports.TestReport{
 		GoProject:       r.prettyProjectPath,
-		RaceDetection:   r.UseRace,
+		RaceDetection:   r.GoTestRaceFlag,
 		ExcludedTests:   r.SkipTests,
 		SelectedTests:   r.SelectTests,
 		Results:         rerunResults,

tools/flakeguard/runner/runner_test.go

@@ -65,7 +65,7 @@ func TestRun(t *testing.T) {
 				ProjectPath:      "./",
 				Verbose:          true,
 				RunCount:         defaultTestRunCount,
-				UseRace:          false,
+				GoTestRaceFlag:   false,
 				SkipTests:        []string{"TestPanic", "TestFlakyPanic", "TestSubTestsSomePanic", "TestTimeout"},
 				FailFast:         false,
 				CollectRawOutput: true,
@@ -163,7 +163,7 @@ func TestRun(t *testing.T) {
 				ProjectPath:      "./",
 				Verbose:          true,
 				RunCount:         defaultTestRunCount,
-				UseRace:          false,
+				GoTestRaceFlag:   false,
 				SkipTests:        []string{},
 				SelectTests:      []string{"TestPanic"},
 				FailFast:         false,
@@ -183,7 +183,7 @@ func TestRun(t *testing.T) {
 				ProjectPath:      "./",
 				Verbose:          true,
 				RunCount:         defaultTestRunCount,
-				UseRace:          false,
+				GoTestRaceFlag:   false,
 				SkipTests:        []string{},
 				SelectTests:      []string{"TestFlakyPanic"},
 				FailFast:         false,
@@ -203,7 +203,7 @@ func TestRun(t *testing.T) {
 				ProjectPath:      "./",
 				Verbose:          true,
 				RunCount:         defaultTestRunCount,
-				UseRace:          false,
+				GoTestRaceFlag:   false,
 				SkipTests:        []string{},
 				SelectTests:      []string{"TestSubTestsSomePanic"},
 				FailFast:         false,
@@ -233,7 +233,7 @@ func TestRun(t *testing.T) {
 				ProjectPath:      "./",
 				Verbose:          true,
 				RunCount:         defaultTestRunCount,
-				UseRace:          false,
+				GoTestRaceFlag:   false,
 				SkipTests:        []string{},
 				SelectTests:      []string{"TestFail", "TestPass"},
 				FailFast:         true,
@@ -293,7 +293,7 @@ func TestRun(t *testing.T) {
 				require.Equal(t, tc.runner.RunCount, testReport.SummaryData.TestRunCount, "unexpected number of test runs")
 			}
 
-			require.Equal(t, tc.runner.UseRace, testReport.RaceDetection, "unexpected race usage")
+			require.Equal(t, tc.runner.GoTestRaceFlag, testReport.RaceDetection, "unexpected race usage")
 
 			assert.Equal(t, len(tc.expectedTests), len(testReport.Results), "unexpected number of test results")
 			for _, result := range testReport.Results {