Flank · bootstraponline · Aug 29, 2019 · Aug 29, 2019 · Aug 29, 2019
diff --git a/test_runner/flank.ios.yml b/test_runner/flank.ios.yml
@@ -29,7 +29,7 @@ gcloud:
   ## Experimental!
   ## The number of times a TestExecution should be re-attempted if one or more\nof its test cases fail for any reason.
   ## The maximum number of reruns allowed is 10. Default is 0, which implies no reruns.
-  # flaky-test-attempts: 0
+  # num-flaky-test-attempts: 0
 
   # -- IosGcloudYml --
 

diff --git a/test_runner/flank.yml b/test_runner/flank.yml
@@ -29,7 +29,7 @@ gcloud:
   ## Experimental!
   ## The number of times a TestExecution should be re-attempted if one or more\nof its test cases fail for any reason.
   ## The maximum number of reruns allowed is 10. Default is 0, which implies no reruns.
-  # flaky-test-attempts: 0
+  # num-flaky-test-attempts: 0
 
   # -- AndroidGcloudYml --
 

diff --git a/test_runner/gradle/wrapper/gradle-wrapper.properties b/test_runner/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/test_runner/src/main/kotlin/ftl/args/AndroidArgs.kt b/test_runner/src/main/kotlin/ftl/args/AndroidArgs.kt
@@ -133,7 +133,7 @@ ${listToString(directoriesToPull)}
 ${listToString(testTargets)}
       device:
 ${devicesToString(devices)}
-      flaky-test-attempts: $flakyTestAttempts
+      num-flaky-test-attempts: $flakyTestAttempts
 
     flank:
       max-test-shards: $maxTestShards

diff --git a/test_runner/src/main/kotlin/ftl/args/IosArgs.kt b/test_runner/src/main/kotlin/ftl/args/IosArgs.kt
@@ -122,7 +122,7 @@ IosArgs
       xcode-version: $xcodeVersion
       device:
 ${devicesToString(devices)}
-      flaky-test-attempts: $flakyTestAttempts
+      num-flaky-test-attempts: $flakyTestAttempts
 
     flank:
       max-test-shards: $maxTestShards

diff --git a/test_runner/src/main/kotlin/ftl/args/yml/GcloudYml.kt b/test_runner/src/main/kotlin/ftl/args/yml/GcloudYml.kt
@@ -27,13 +27,13 @@ class GcloudYmlParams(
     @field:JsonProperty("results-history-name")
     val resultsHistoryName: String? = null,
 
-    @field:JsonProperty("flaky-test-attempts")
+    @field:JsonProperty("num-flaky-test-attempts")
     val flakyTestAttempts: Int = 0
 ) {
     companion object : IYmlKeys {
         override val keys =
             listOf("results-bucket", "results-dir", "record-video", "timeout", "async",
-                "results-history-name", "flaky-test-attempts")
+                "results-history-name", "num-flaky-test-attempts")
     }
 }
 

diff --git a/test_runner/src/main/kotlin/ftl/args/yml/YamlDeprecated.kt b/test_runner/src/main/kotlin/ftl/args/yml/YamlDeprecated.kt
@@ -29,6 +29,11 @@ object YamlDeprecated {
     )
 
     private val transforms = listOf(
+        ModifiedKey(
+            Key(Parent.gcloud, "flaky-test-attempts"),
+            Key(Parent.gcloud, "num-flaky-test-attempts"),
+            Level.Warning
+        ),
         // flank: testShards -> flank: maxTestShards
         ModifiedKey(
             Key(Parent.flank, "testShards"),

diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidRunCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidRunCommand.kt
@@ -256,7 +256,7 @@ class AndroidRunCommand : Runnable {
     var resultsHistoryName: String? = null
 
     @Option(
-        names = ["--flaky-test-attempts"],
+        names = ["--num-flaky-test-attempts"],
         description = ["The number of times a TestExecution should be re-attempted if one or more of its test cases " +
                 "fail for any reason. The maximum number of reruns allowed is 10. Default is 0, which implies no reruns."]
     )

diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosRunCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosRunCommand.kt
@@ -179,7 +179,7 @@ class IosRunCommand : Runnable {
     var resultsHistoryName: String? = null
 
     @Option(
-        names = ["--flaky-test-attempts"],
+        names = ["--num-flaky-test-attempts"],
         description = ["The number of times a TestExecution should be re-attempted if one or more of its test cases " +
                 "fail for any reason. The maximum number of reruns allowed is 10. Default is 0, which implies no reruns."]
     )

diff --git a/test_runner/src/main/kotlin/ftl/reports/util/JUnitDedupe.kt b/test_runner/src/main/kotlin/ftl/reports/util/JUnitDedupe.kt
@@ -3,7 +3,7 @@ package ftl.reports.util
 import ftl.reports.xml.model.JUnitTestCase
 import ftl.reports.xml.model.JUnitTestResult
 
-// Read in JUnitReport.xml and remove duplicate results when `flaky-test-attempts` is > 0
+// Read in JUnitReport.xml and remove duplicate results when `num-flaky-test-attempts` is > 0
 // for each test `name="testFails" classname="com.example.app.ExampleUiTest"`
 // Keep first result. If next result for the same test is successful, keep last successful result.
 object JUnitDedupe {

diff --git a/test_runner/src/main/kotlin/ftl/run/RunningDevices.kt b/test_runner/src/main/kotlin/ftl/run/RunningDevices.kt
@@ -42,7 +42,7 @@ class RunningDevice(private val stopwatch: StopWatch, val id: String) {
             progress = details.progressMessages ?: progress
         }
 
-        // flaky-test-attempts restarts progress array at size 1
+        // num-flaky-test-attempts restarts progress array at size 1
         if (lastProgressLen > progress.size) {
             lastProgressLen = 0
         }

diff --git a/test_runner/src/test/kotlin/ftl/args/AndroidArgsTest.kt b/test_runner/src/test/kotlin/ftl/args/AndroidArgsTest.kt
@@ -59,7 +59,7 @@ class AndroidArgsTest {
             version: 24
             locale: en
             orientation: portrait
-          flaky-test-attempts: 3
+          num-flaky-test-attempts: 3
 
         flank:
           max-test-shards: 7
@@ -231,7 +231,7 @@ AndroidArgs
           version: 24
           locale: en
           orientation: portrait
-      flaky-test-attempts: 3
+      num-flaky-test-attempts: 3
 
     flank:
       max-test-shards: 7
@@ -829,7 +829,7 @@ AndroidArgs
     @Test
     fun `cli flakyTestAttempts`() {
         val cli = AndroidRunCommand()
-        CommandLine(cli).parseArgs("--flaky-test-attempts=3")
+        CommandLine(cli).parseArgs("--num-flaky-test-attempts=3")
 
         val yaml = """
         gcloud:

diff --git a/test_runner/src/test/kotlin/ftl/args/IosArgsTest.kt b/test_runner/src/test/kotlin/ftl/args/IosArgsTest.kt
@@ -51,7 +51,7 @@ class IosArgsTest {
             version: 11.2
             locale: c
             orientation: d
-          flaky-test-attempts: 4
+          num-flaky-test-attempts: 4
 
         flank:
           max-test-shards: 7
@@ -177,7 +177,7 @@ IosArgs
           version: 11.2
           locale: c
           orientation: d
-      flaky-test-attempts: 4
+      num-flaky-test-attempts: 4
 
     flank:
       max-test-shards: 7
@@ -623,7 +623,7 @@ IosArgs
     @Test
     fun `cli flakyTestAttempts`() {
         val cli = IosRunCommand()
-        CommandLine(cli).parseArgs("--flaky-test-attempts=3")
+        CommandLine(cli).parseArgs("--num-flaky-test-attempts=3")
 
         val yaml = """
         gcloud:

diff --git a/test_runner/src/test/kotlin/ftl/args/yml/YamlDeprecatedTest.kt b/test_runner/src/test/kotlin/ftl/args/yml/YamlDeprecatedTest.kt
@@ -73,11 +73,12 @@ class YamlDeprecatedTest {
     }
 
     @Test
-    fun `Flank old keys renamed to new keys`() {
+    fun `Old keys renamed to new keys`() {
         val input = """
             ---
             gcloud:
               project: 0
+              flaky-test-attempts: 1
 
             flank:
               testShards: 1
@@ -90,7 +91,8 @@ class YamlDeprecatedTest {
 
         val expected = """
             ---
-            gcloud: {}
+            gcloud:
+              num-flaky-test-attempts: 1
             flank:
               project: 0
               max-test-shards: 1

diff --git a/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/AndroidRunCommandTest.kt b/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/AndroidRunCommandTest.kt
@@ -307,7 +307,7 @@ class AndroidRunCommandTest {
     @Test
     fun `flakyTestAttempts parse`() {
         val cmd = AndroidRunCommand()
-        CommandLine(cmd).parseArgs("--flaky-test-attempts=10")
+        CommandLine(cmd).parseArgs("--num-flaky-test-attempts=10")
 
         assertThat(cmd.flakyTestAttempts).isEqualTo(10)
     }

diff --git a/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/IosRunCommandTest.kt b/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/IosRunCommandTest.kt
@@ -230,7 +230,7 @@ class IosRunCommandTest {
     @Test
     fun `flakyTestAttempts parse`() {
         val cmd = IosRunCommand()
-        CommandLine(cmd).parseArgs("--flaky-test-attempts=10")
+        CommandLine(cmd).parseArgs("--num-flaky-test-attempts=10")
 
         assertThat(cmd.flakyTestAttempts).isEqualTo(10)
     }