Update go-test-timeout flag to test runner and update Runner struct

Author: lukaszcl

tools/flakeguard/cmd/run.go

@@ -40,7 +40,6 @@ var RunTestsCmd = &cobra.Command{
 		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")
 		mainReportPath, _ := cmd.Flags().GetString("main-report-path")
@@ -56,16 +55,17 @@ var RunTestsCmd = &cobra.Command{
 		omitOutputsOnSuccess, _ := cmd.Flags().GetBool("omit-test-outputs-on-success")
 		ignoreParentFailuresOnSubtests, _ := cmd.Flags().GetBool("ignore-parent-failures-on-subtests")
 		failFast, _ := cmd.Flags().GetBool("fail-fast")
+		goTestTimeoutFlag, _ := cmd.Flags().GetString("go-test-timeout")
 
 		// Retrieve go-test-count flag as a pointer if explicitly provided.
-		var goTestCount *int
+		var goTestCountFlag *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
+			goTestCountFlag = &v
 		}
 
 		// Handle the compatibility between min/max pass ratio
@@ -109,9 +109,9 @@ var RunTestsCmd = &cobra.Command{
 			ProjectPath:                    projectPath,
 			Verbose:                        true,
 			RunCount:                       runCount,
-			Timeout:                        timeout,
+			GoTestTimeoutFlag:              goTestTimeoutFlag,
 			Tags:                           tags,
-			GoTestCountFlag:                goTestCount,
+			GoTestCountFlag:                goTestCountFlag,
 			GoTestRaceFlag:                 useRace,
 			SkipTests:                      skipTests,
 			SelectTests:                    selectTests,
@@ -253,8 +253,8 @@ func init() {
 	)
 	RunTestsCmd.Flags().Bool("run-all-packages", false, "Run all test packages in the project. This flag overrides --test-packages and --test-packages-json")
 	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().String("go-test-timeout", "", "Passed on to the 'go test' command as the -timeout 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")

tools/flakeguard/runner/runner.go

@@ -27,24 +27,24 @@ var (
 
 // Runner describes the test run parameters and raw test outputs
 type Runner struct {
-	ProjectPath                    string        // Path to the Go project directory.
-	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.
-	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.
-	ShuffleSeed                    string        // Set seed for test shuffling -shuffle={seed} flag. Must be used with UseShuffle.
-	FailFast                       bool          // Stop on first test failure.
-	SkipTests                      []string      // Test names to exclude.
-	SelectTests                    []string      // Test names to include.
-	CollectRawOutput               bool          // Set to true to collect test output for later inspection.
-	OmitOutputsOnSuccess           bool          // Set to true to omit test outputs on success.
-	MaxPassRatio                   float64       // Maximum pass ratio threshold for a test to be considered flaky.
-	IgnoreParentFailuresOnSubtests bool          // Ignore failures in parent tests when only subtests fail.
+	ProjectPath                    string   // Path to the Go project directory.
+	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.
+	GoTestCountFlag                *int     // Run go test with -count flag.
+	GoTestRaceFlag                 bool     // Run go test with -race flag.
+	GoTestTimeoutFlag              string   // Run go test with -timeout flag
+	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.
+	SkipTests                      []string // Test names to exclude.
+	SelectTests                    []string // Test names to include.
+	CollectRawOutput               bool     // Set to true to collect test output for later inspection.
+	OmitOutputsOnSuccess           bool     // Set to true to omit test outputs on success.
+	MaxPassRatio                   float64  // Maximum pass ratio threshold for a test to be considered flaky.
+	IgnoreParentFailuresOnSubtests bool     // Ignore failures in parent tests when only subtests fail.
 	rawOutputs                     map[string]*bytes.Buffer
 }
 
@@ -151,8 +151,8 @@ func (r *Runner) runTestPackage(packageName string) (string, bool, error) {
 	if r.GoTestRaceFlag {
 		args = append(args, "-race")
 	}
-	if r.Timeout > 0 {
-		args = append(args, fmt.Sprintf("-timeout=%s", r.Timeout.String()))
+	if r.GoTestTimeoutFlag != "" {
+		args = append(args, fmt.Sprintf("-timeout=%s", r.GoTestTimeoutFlag))
 	}
 	if len(r.Tags) > 0 {
 		args = append(args, fmt.Sprintf("-tags=%s", strings.Join(r.Tags, ",")))
@@ -755,8 +755,8 @@ func (r *Runner) RerunFailedTests(failedTests []reports.TestResult) (*reports.Te
 			if r.GoTestRaceFlag {
 				cmd = append(cmd, "-race")
 			}
-			if r.Timeout > 0 {
-				cmd = append(cmd, fmt.Sprintf("-timeout=%s", r.Timeout.String()))
+			if r.GoTestTimeoutFlag != "" {
+				cmd = append(cmd, fmt.Sprintf("-timeout=%s", r.GoTestTimeoutFlag))
 			}
 			if len(r.Tags) > 0 {
 				cmd = append(cmd, fmt.Sprintf("-tags=%s", strings.Join(r.Tags, ",")))