Update default test run time to avoid timeouts on runs without cached results.

Author: RainNapper

test_runner/src/main/kotlin/ftl/shard/Shard.kt

@@ -1,5 +1,6 @@
 package ftl.shard
 
+import com.google.common.annotations.VisibleForTesting
 import ftl.args.AndroidArgs
 import ftl.args.IArgs
 import ftl.args.IosArgs
@@ -44,6 +45,9 @@ class com.foo.ClassName#testMethodToSkip
 */
 
 object Shard {
+    // When a test does not have previous results to reference, fall back to this run time.
+    @VisibleForTesting
+    const val DEFAULT_TEST_TIME_SEC: Double = 120.0
 
     private fun JUnitTestCase.androidKey(): String {
         return "class $classname#$name"
@@ -66,7 +70,7 @@ object Shard {
         if (args.shardTime < -1 || args.shardTime == 0) fatalError("Invalid shard time ${args.shardTime}")
 
         val junitMap = createJunitMap(oldTestResult, args)
-        val testsTotalTime = testsToRun.sumByDouble { junitMap[it] ?: 10.0 }
+        val testsTotalTime = testsToRun.sumByDouble { junitMap[it] ?: DEFAULT_TEST_TIME_SEC }
 
         val shardsByTime = ceil(testsTotalTime / args.shardTime).toInt()
 
@@ -104,7 +108,7 @@ object Shard {
 
         testsToRun.forEach { key ->
             val previousTime = junitMap[key]
-            val time = previousTime ?: 10.0
+            val time = previousTime ?: DEFAULT_TEST_TIME_SEC
 
             if (previousTime == null) {
                 cacheMiss += 1

test_runner/src/test/kotlin/ftl/shard/ShardTest.kt

@@ -91,7 +91,7 @@ class ShardTest {
         val result = Shard.createShardsByShardCount(testsToRun, JUnitTestResult(null), mockArgs(2))
 
         assertThat(result.size).isEqualTo(2)
-        assertThat(result.sumByDouble { it.time }).isEqualTo(30.0)
+        assertThat(result.sumByDouble { it.time }).isEqualTo(3 * Shard.DEFAULT_TEST_TIME_SEC)
 
         val ordered = result.sortedBy { it.testMethods.size }
         assertThat(ordered[0].testMethods.size).isEqualTo(1)
@@ -103,9 +103,10 @@ class ShardTest {
         val testsToRun = listOf("a/a", "b/b", "c/c", "w", "y", "z")
         val result = Shard.createShardsByShardCount(testsToRun, sample(), mockArgs(4))
         assertThat(result.size).isEqualTo(4)
-        assertThat(result.sumByDouble { it.time }).isEqualTo(37.0)
+        assertThat(result.sumByDouble { it.time }).isEqualTo(7.0 + 3 * Shard.DEFAULT_TEST_TIME_SEC)
 
         val ordered = result.sortedBy { it.testMethods.size }
+        // Expect a/a, b/b, c/c to be in one shard, and w, y, z to each be in their own shards.
         assertThat(ordered[0].testMethods.size).isEqualTo(1)
         assertThat(ordered[1].testMethods.size).isEqualTo(1)
         assertThat(ordered[2].testMethods.size).isEqualTo(1)
@@ -153,6 +154,43 @@ class ShardTest {
         assertThat(result).isEqualTo(3)
     }
 
+    @Test
+    fun `createShardsByShardTime uncachedTestResultsUseDefaultTime`() {
+        val testsToRun = listOf("h/h", "i/i", "j/j")
+        val suite = sample()
+        val result = Shard.shardCountByTime(
+            testsToRun,
+            suite,
+            mockArgs(maxTestShards = -1, shardTime = Shard.DEFAULT_TEST_TIME_SEC.toInt()))
+
+        assertThat(result).isEqualTo(3)
+    }
+
+    @Test
+    fun `createShardsByShardTime mixedCachedAndUncachedTestResultsUseDefaultTime`() {
+        // Test "a/a" is hard-coded to have 1.0 second run time in test suite results.
+        val testsToRun = listOf("a/a", "i/i", "j/j")
+        val suite = sample()
+        val result = Shard.shardCountByTime(
+            testsToRun,
+            suite,
+            mockArgs(maxTestShards = -1, shardTime = Shard.DEFAULT_TEST_TIME_SEC.toInt() + 1))
+
+        assertThat(result).isEqualTo(2)
+    }
+
+    @Test
+    fun `createShardsByShardTime uncachedTestResultsAllInOneShard`() {
+        val testsToRun = listOf("i/i", "j/j")
+        val suite = sample()
+        val result = Shard.shardCountByTime(
+            testsToRun,
+            suite,
+            mockArgs(maxTestShards = -1, shardTime = (Shard.DEFAULT_TEST_TIME_SEC * 2).toInt()))
+
+        assertThat(result).isEqualTo(1)
+    }
+
     @Test(expected = RuntimeException::class)
     fun `createShardsByShardCount throws on forcedShardCount = 0`() {
         Shard.createShardsByShardCount(