Rename testRuns to repeatTests (#306)

Author: bootstraponline

test_runner/flank.ios.yml

@@ -15,9 +15,9 @@ flank:
   # test shards - the amount of groups to split the test suite into
   # set to -1 to use one shard per test.
   testShards: 1
-  # test runs - the amount of times to run the tests.
+  # repeat tests - the amount of times to run the tests.
   # 1 runs the tests once. 10 runs all the tests 10x
-  testRuns: 1
+  repeatTests: 1
 # # always run - these tests are inserted at the beginning of every shard
 # # useful if you need to grant permissions or login before other tests run
 # test-targets-always-run:

test_runner/flank.yml

@@ -27,9 +27,9 @@ flank:
   # test shards - the amount of groups to split the test suite into
   # set to -1 to use one shard per test.
   testShards: 1
-  # test runs - the amount of times to run the tests.
+  # repeat tests - the amount of times to run the tests.
   # 1 runs the tests once. 10 runs all the tests 10x
-  testRuns: 1
+  repeatTests: 1
 # # always run - these tests are inserted at the beginning of every shard
 # # useful if you need to grant permissions or login before other tests run
 # test-targets-always-run:

test_runner/src/main/kotlin/ftl/args/AndroidArgs.kt

@@ -49,7 +49,7 @@ class AndroidArgs(
 
     private val flank = flankYml.flank
     val testShards = flank.testShards
-    override val testRuns = flank.testRuns
+    override val repeatTests = flank.repeatTests
     val testTargetsAlwaysRun = flank.testTargetsAlwaysRun
 
     // computed properties not specified in yaml
@@ -124,7 +124,7 @@ AndroidArgs
 
     flank:
       testShards: $testShards
-      testRuns: $testRuns
+      repeatTests: $repeatTests
       testTargetsAlwaysRun: $testTargetsAlwaysRun
    """.trimIndent()
     }

test_runner/src/main/kotlin/ftl/args/IArgs.kt

@@ -4,6 +4,6 @@ interface IArgs {
     val async: Boolean
     val resultsBucket: String
     val projectId: String
-    val testRuns: Int
+    val repeatTests: Int
     val testShardChunks: List<List<String>>
 }

test_runner/src/main/kotlin/ftl/args/IosArgs.kt

@@ -37,7 +37,7 @@ class IosArgs(
 
     private val flank = flankYml.flank
     val testShards = flank.testShards
-    override val testRuns = flank.testRuns
+    override val repeatTests = flank.repeatTests
     val testTargetsAlwaysRun = flank.testTargetsAlwaysRun
 
     private val iosFlank = iosFlankYml.flank
@@ -89,7 +89,7 @@ IosArgs
 
     flank:
       testShards: $testShards
-      testRuns: $testRuns
+      repeatTests: $repeatTests
       testTargetsAlwaysRun: $testTargetsAlwaysRun
       # iOS flank
       testTargets: $testTargets

test_runner/src/main/kotlin/ftl/args/yml/FlankYml.kt

@@ -8,18 +8,18 @@ import ftl.util.Utils.fatalError
 @JsonIgnoreProperties(ignoreUnknown = true)
 class FlankYmlParams(
     val testShards: Int = 1,
-    val testRuns: Int = 1,
+    val repeatTests: Int = 1,
 
     @field:JsonProperty("test-targets-always-run")
     val testTargetsAlwaysRun: List<String> = emptyList()
 ) {
     companion object : IYmlKeys {
-        override val keys = listOf("testShards", "testRuns", "test-targets-always-run")
+        override val keys = listOf("testShards", "repeatTests", "test-targets-always-run")
     }
 
     init {
         if (testShards <= 0 && testShards != -1) fatalError("testShards must be >= 1 or -1")
-        if (testRuns < 1) fatalError("testRuns must be >= 1")
+        if (repeatTests < 1) fatalError("repeatTests must be >= 1")
     }
 }
 

test_runner/src/main/kotlin/ftl/run/AndroidTestRunner.kt

@@ -22,7 +22,7 @@ object AndroidTestRunner {
 
         val apks = resolveApks(androidArgs, runGcsPath)
         val jobs = arrayListOf<Deferred<TestMatrix>>()
-        val runCount = androidArgs.testRuns
+        val runCount = androidArgs.repeatTests
         val deviceCount = androidArgs.testShardChunks.size
         val shardCounter = ShardCounter()
 

test_runner/src/main/kotlin/ftl/run/GenericTestRunner.kt

@@ -53,7 +53,7 @@ object GenericTestRunner {
     }
 
     fun beforeRunMessage(args: IArgs): String {
-        val runCount = args.testRuns
+        val runCount = args.repeatTests
         val shardCount = args.testShardChunks.size
         val testsPerShard = args.testShardChunks.first().size
         val testsCount = args.testShardChunks.sumBy { it.size }

test_runner/src/main/kotlin/ftl/run/IosTestRunner.kt

@@ -31,7 +31,7 @@ object IosTestRunner {
         val xcTestParsed = Xctestrun.parse(yamlConfig.xctestrunFile)
 
         val jobs = arrayListOf<Deferred<TestMatrix>>()
-        val runCount = yamlConfig.testRuns
+        val runCount = yamlConfig.repeatTests
         val deviceCount = yamlConfig.testShardChunks.size
         val shardCounter = ShardCounter()
 

test_runner/src/test/kotlin/ftl/args/AndroidArgsFileTest.kt

@@ -80,7 +80,7 @@ class AndroidArgsFileTest {
 
         with(config) {
             assert(testShards, 1)
-            assert(testRuns, 1)
+            assert(repeatTests, 1)
         }
     }
 

test_runner/src/test/kotlin/ftl/args/AndroidArgsTest.kt

@@ -42,7 +42,7 @@ class AndroidArgsTest {
 
         flank:
           testShards: 7
-          testRuns: 8
+          repeatTests: 8
           test-targets-always-run:
             - class example.Test#grantPermission
       """
@@ -124,7 +124,7 @@ class AndroidArgsTest {
 
             // FlankYml
             assert(testShards, 7)
-            assert(testRuns, 8)
+            assert(repeatTests, 8)
             assert(testTargetsAlwaysRun, listOf("class example.Test#grantPermission"))
         }
     }
@@ -154,7 +154,7 @@ AndroidArgs
 
     flank:
       testShards: 7
-      testRuns: 8
+      repeatTests: 8
       testTargetsAlwaysRun: [class example.Test#grantPermission]
 """.trimIndent()
         )
@@ -191,7 +191,7 @@ AndroidArgs
 
             // FlankYml
             assert(testShards, 1)
-            assert(testRuns, 1)
+            assert(repeatTests, 1)
             assert(testTargetsAlwaysRun, empty)
         }
     }

test_runner/src/test/kotlin/ftl/args/FlankYmlTest.kt

@@ -25,8 +25,8 @@ class FlankYmlTest {
     fun testValidArgs() {
         FlankYml()
         FlankYml(FlankYmlParams(testShards = -1))
-        val yml = FlankYml(FlankYmlParams(testShards = 1, testRuns = 1))
-        assertThat(yml.flank.testRuns).isEqualTo(1)
+        val yml = FlankYml(FlankYmlParams(testShards = 1, repeatTests = 1))
+        assertThat(yml.flank.repeatTests).isEqualTo(1)
         assertThat(yml.flank.testShards).isEqualTo(1)
         assertThat(yml.flank.testTargetsAlwaysRun).isEqualTo(emptyList<String>())
         assertThat(FlankYml.map).isNotEmpty()
@@ -39,8 +39,8 @@ class FlankYmlTest {
     }
 
     @Test
-    fun testInvalidTestRuns() {
+    fun testInvalidrepeatTests() {
         expectedExitRule.expectSystemExitWithStatus(-1)
-        FlankYml(FlankYmlParams(testRuns = 0))
+        FlankYml(FlankYmlParams(repeatTests = 0))
     }
 }

test_runner/src/test/kotlin/ftl/args/IosArgsFileTest.kt

@@ -48,7 +48,7 @@ class IosArgsFileTest {
                 )
             )
             assert(testShards, 1)
-            assert(testRuns, 1)
+            assert(repeatTests, 1)
         }
     }
 

test_runner/src/test/kotlin/ftl/args/IosArgsTest.kt

@@ -38,7 +38,7 @@ class IosArgsTest {
 
         flank:
           testShards: 7
-          testRuns: 8
+          repeatTests: 8
           test-targets-always-run:
             - a/testGrantPermissions
           test-targets:
@@ -84,7 +84,7 @@ class IosArgsTest {
 
             // FlankYml
             assert(testShards, 7)
-            assert(testRuns, 8)
+            assert(repeatTests, 8)
             assert(testTargetsAlwaysRun, listOf("a/testGrantPermissions"))
 
             // IosFlankYml
@@ -111,7 +111,7 @@ IosArgs
 
     flank:
       testShards: 7
-      testRuns: 8
+      repeatTests: 8
       testTargetsAlwaysRun: [a/testGrantPermissions]
       # iOS flank
       testTargets: [b/testBasicSelection]
@@ -144,7 +144,7 @@ IosArgs
 
             // FlankYml
             assert(testShards, 1)
-            assert(testRuns, 1)
+            assert(repeatTests, 1)
             assert(testTargetsAlwaysRun, emptyList<String>())
 
             // IosFlankYml

test_runner/src/test/kotlin/ftl/doctor/DoctorTest.kt

@@ -50,7 +50,7 @@ gcloud:
 
 flank:
   testShards: 7
-  testRuns: 8
+  repeatTests: 8
   test-targets-always-run:
     - .
   three: .
@@ -98,7 +98,7 @@ gcloud:
 
 flank:
   testShards: .
-  testRuns: .
+  repeatTests: .
   test-targets-always-run:
     - .
   test-targets:

test_runner/src/test/kotlin/ftl/fixtures/flank.gcs.yml

@@ -27,4 +27,4 @@ gcloud:
 
 flank:
   testShards: 1
-  testRuns: 1
+  repeatTests: 1

test_runner/src/test/kotlin/ftl/fixtures/flank.ios.gcs.yml

@@ -17,4 +17,4 @@ flank:
   test-targets:
   - EarlGreyExampleMixedTests/testBasicSelection
   testShards: 1
-  testRuns: 1
+  repeatTests: 1

test_runner/src/test/kotlin/ftl/fixtures/flank.ios.yml

@@ -15,4 +15,4 @@ flank:
   test-targets:
   - EarlGreyExampleMixedTests/testBasicSelection
   testShards: 1
-  testRuns: 1
+  repeatTests: 1

test_runner/src/test/kotlin/ftl/fixtures/flank.local.yml

@@ -27,4 +27,4 @@ gcloud:
 
 flank:
   testShards: 1
-  testRuns: 1
+  repeatTests: 1

test_runner/src/test/kotlin/ftl/fixtures/flank2.ios.yml

@@ -13,7 +13,7 @@ gcloud:
 
 flank:
   testShards: 2
-  testRuns: 1
+  repeatTests: 1
   test-targets:
   - EarlGreyExampleMixedTests/testGrantCameraPermission
   - EarlGreyExampleMixedTests/testGrantMicrophonePermission

test_runner/src/test/kotlin/ftl/run/GenericTestRunnerTest.kt

@@ -9,9 +9,9 @@ import org.mockito.Mockito.mock
 
 class GenericTestRunnerTest {
 
-    private fun createMock(testRuns: Int, testShardChunks: List<List<String>>): IArgs {
+    private fun createMock(repeatTests: Int, testShardChunks: List<List<String>>): IArgs {
         val args = mock(IArgs::class.java)
-        `when`(args.testRuns).thenReturn(testRuns)
+        `when`(args.repeatTests).thenReturn(repeatTests)
         `when`(args.testShardChunks).thenReturn(testShardChunks)
         return args
     }