Fix parsing max-tests option (#86)

rwx-research · Nov 20, 2024 · 2ba7220 · 2ba7220
1 parent bd8a2ca
commit 2ba7220
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/cmd/captain/run.go b/cmd/captain/run.go
@@ -112,6 +112,10 @@ func createRunCmd(cliArgs *CliArgs) *cobra.Command {
 						partitionTotal = provider.PartitionNodes.Total
 					}
 
+					if suiteConfig.Retries.MaxTests == "" && suiteConfig.Retries.MaxTestsLegacyName != "" {
+						suiteConfig.Retries.MaxTests = suiteConfig.Retries.MaxTestsLegacyName
+					}
+
 					runConfig = cli.RunConfig{
 						Args:                      args,
 						CloudOrganizationSlug:     "deep_link",

diff --git a/internal/cli/config_file.go b/internal/cli/config_file.go
@@ -29,9 +29,10 @@ type SuiteConfigResults struct {
 type SuiteConfigRetries struct {
 	Attempts                  int
 	Command                   string
-	FailFast                  bool `yaml:"fail-fast"`
-	FlakyAttempts             int  `yaml:"flaky-attempts"`
-	MaxTests                  string
+	FailFast                  bool     `yaml:"fail-fast"`
+	FlakyAttempts             int      `yaml:"flaky-attempts"`
+	MaxTests                  string   `yaml:"max-tests"`
+	MaxTestsLegacyName        string   `yaml:"maxtests"`
 	PostRetryCommands         []string `yaml:"post-retry-commands"`
 	PreRetryCommands          []string `yaml:"pre-retry-commands"`
 	IntermediateArtifactsPath string   `yaml:"intermediate-artifacts-path"`

diff --git a/test/fixtures/integration-tests/captain-configs/junit-xml-reporter.printf-yaml b/test/fixtures/integration-tests/captain-configs/junit-xml-reporter.printf-yaml
@@ -23,7 +23,7 @@ test-suites:
       command: ""
       fail-fast: false
       flaky-attempts: 0
-      maxtests: ""
+      max-tests: ""
       post-retry-commands: []
       pre-retry-commands: []
       intermediate-artifacts-path: ""
diff --git a/test/fixtures/integration-tests/captain-configs/markdown-summary-reporter.printf-yaml b/test/fixtures/integration-tests/captain-configs/markdown-summary-reporter.printf-yaml
@@ -23,7 +23,7 @@ test-suites:
       command: ""
       fail-fast: false
       flaky-attempts: 0
-      maxtests: ""
+      max-tests: ""
       post-retry-commands: []
       pre-retry-commands: []
       intermediate-artifacts-path: ""
diff --git a/test/fixtures/integration-tests/captain-configs/rwx-v1-json-reporter.printf-yaml b/test/fixtures/integration-tests/captain-configs/rwx-v1-json-reporter.printf-yaml
@@ -23,7 +23,7 @@ test-suites:
       command: ""
       fail-fast: false
       flaky-attempts: 0
-      maxtests: ""
+      max-tests: ""
       post-retry-commands: []
       pre-retry-commands: []
       intermediate-artifacts-path: ""