feat: Added printing missing options (#1214)

* feat: Added printing missing options * feat: Added printing missing options * Remove carriage line Co-authored-by: Michael Wright <[email protected]>
Flank · Oct 6, 2020 · 762e76d · 762e76d
1 parent c6bc9fb
commit 762e76d
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -178,6 +178,11 @@ flank:
   ## Default: 120.0
   # default-test-time: 15
 
+  ## Set default test time (in seconds) used for calculating shards of parametrized classes when previous tests results are not available.
+  ## Default test time for classes should be different from the default time for test
+  ## Default: 240.0
+  # default-class-test-time: 30
+
   ## Disables sharding. Useful for parameterized tests.
   # disable-sharding: false
 
@@ -400,6 +405,11 @@ flank:
   ## Default: 120.0
   # default-test-time: 15
 
+  ## Set default test time (in seconds) used for calculating shards of parametrized classes when previous tests results are not available.
+  ## Default test time for classes should be different from the default time for test
+  ## Default: 240.0
+  # default-class-test-time: 30
+
   ## Disables sharding. Useful for parameterized tests.
   # disable-sharding: false
 

diff --git a/flank-scripts/src/test/kotlin/flank/scripts/dependencies/update/UpdateGradleTest.kt b/flank-scripts/src/test/kotlin/flank/scripts/dependencies/update/UpdateGradleTest.kt
@@ -32,7 +32,7 @@ class UpdateGradleTest {
 
     @Test
     fun `Should update RC version gradle`() {
-        val rcReportText = testReport.readText().replace(
+        val rcReportText = testReport.readText().replace("\r\n", "\n").replace(
             """
     |        "releaseCandidate": {
     |            "version": "6.7-rc-1",

diff --git a/test_runner/flank.ios.yml b/test_runner/flank.ios.yml
@@ -109,7 +109,12 @@ flank:
   ## Default: 120.0
   # default-test-time: 15
 
-  ## Disables sharding. Useful for parameterized tests.
+  ## Set default test time (in seconds) used for calculating shards of parametrized classes when previous tests results are not available.
+  ## Default test time for classes should be different from the default time for test
+  ## Default: 240.0
+  # default-class-test-time: 30
+
+## Disables sharding. Useful for parameterized tests.
   # disable-sharding: false
 
   ## always run - these tests are inserted at the beginning of every shard

diff --git a/test_runner/flank.yml b/test_runner/flank.yml
@@ -169,6 +169,11 @@ flank:
   ## Default: 120.0
   # default-test-time: 15
 
+  ## Set default test time (in seconds) used for calculating shards of parametrized classes when previous tests results are not available.
+  ## Default test time for classes should be different from the default time for test
+  ## Default: 240.0
+  # default-class-test-time: 30
+
   ## Disables sharding. Useful for parameterized tests.
   # disable-sharding: false
 

diff --git a/test_runner/src/main/kotlin/ftl/args/AndroidArgs.kt b/test_runner/src/main/kotlin/ftl/args/AndroidArgs.kt
@@ -11,7 +11,7 @@ data class AndroidArgs(
     val useOrchestrator: Boolean,
     val roboDirectives: List<FlankRoboDirective>,
     val roboScript: String?,
-    val environmentVariables: Map<String, String>,
+    val environmentVariables: Map<String, String>, // should not be printed, becuase could contains sensitive informations
     val directoriesToPull: List<String>,
     val otherFiles: Map<String, String>,
     val performanceMetrics: Boolean,
@@ -73,6 +73,8 @@ AndroidArgs
       legacy-junit-result: $useLegacyJUnitResult
       ignore-failed-tests: $ignoreFailedTests
       output-style: ${outputStyle.name.toLowerCase()}
+      disable-results-upload: $disableResultsUpload
+      default-class-test-time: $defaultClassTestTime
    """.trimIndent()
     }
 }

diff --git a/test_runner/src/main/kotlin/ftl/args/IosArgs.kt b/test_runner/src/main/kotlin/ftl/args/IosArgs.kt
@@ -58,6 +58,8 @@ IosArgs
       run-timeout: $runTimeout
       ignore-failed-tests: $ignoreFailedTests
       output-style: ${outputStyle.name.toLowerCase()}
+      disable-results-upload: $disableResultsUpload
+      default-class-test-time: $defaultClassTestTime
     """.trimIndent()
     }
 }

diff --git a/test_runner/src/test/kotlin/ftl/args/AndroidArgsTest.kt b/test_runner/src/test/kotlin/ftl/args/AndroidArgsTest.kt
@@ -138,6 +138,8 @@ class AndroidArgsTest {
           run-timeout: 20m
           ignore-failed-tests: true
           output-style: single
+          disable-results-upload: true
+          default-class-test-time: 30.0
       """
 
     @After
@@ -357,6 +359,8 @@ AndroidArgs
       legacy-junit-result: false
       ignore-failed-tests: true
       output-style: single
+      disable-results-upload: true
+      default-class-test-time: 30.0
 """.trimIndent()
         )
     }
@@ -418,6 +422,8 @@ AndroidArgs
       legacy-junit-result: true
       ignore-failed-tests: false
       output-style: multi
+      disable-results-upload: false
+      default-class-test-time: 240.0
         """.trimIndent(),
             args.toString()
         )

diff --git a/test_runner/src/test/kotlin/ftl/args/IosArgsTest.kt b/test_runner/src/test/kotlin/ftl/args/IosArgsTest.kt
@@ -91,6 +91,8 @@ class IosArgsTest {
           ignore-failed-tests: true
           keep-file-path: true
           output-style: single
+          disable-results-upload: true
+          default-class-test-time: 30.0
         """
 
     @get:Rule
@@ -251,6 +253,8 @@ IosArgs
       run-timeout: 15m
       ignore-failed-tests: true
       output-style: single
+      disable-results-upload: true
+      default-class-test-time: 30.0
 """.trimIndent()
         )
     }
@@ -301,6 +305,8 @@ IosArgs
       run-timeout: -1
       ignore-failed-tests: false
       output-style: multi
+      disable-results-upload: false
+      default-class-test-time: 240.0
         """.trimIndent(),
             args.toString()
         )