Fix shards calculation when there are ignored tests and shardTime is -1

release_notes.md

@@ -1,4 +1,5 @@
 ## next (unreleased)
+- [#704](https://github.com/Flank/flank/pull/704) Fix shards calculation when there are ignored tests and shardTime is -1. ([jan-gogo](https://github.com/jan-gogo))
 - [#692](https://github.com/Flank/flank/pull/698) Add support for other-files option. ([jan-gogo](https://github.com/jan-gogo))
 - [#695](https://github.com/Flank/flank/pull/695) Add support for additional-apks option. ([jan-gogo](https://github.com/jan-gogo))
 - [#683](https://github.com/Flank/flank/pull/683) Print web link. ([pawelpasterz](https://github.com/pawelpasterz))

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

@@ -118,7 +118,12 @@ object Shard {
             // We want to iterate over testcase going from slowest to fastest
             .sortedByDescending(TestMethod::time)
 
-        val testCount = testCases.size
+        // Ugly hotfix for case when all test cases are annotated with @Ignore
+        // we need to filter them because they have time == 0.0 which cause empty shards creation, few lines later
+        // and we don't need additional shards for ignored tests.
+        val testCount =
+            if (testCases.isEmpty()) 0
+            else testCases.filter { it.time > 0.0 }.takeIf { it.isNotEmpty() }?.size ?: 1
 
         // If maxShards is infinite or we have more shards than tests, let's match it
         val shardsCount = if (maxShards == -1 || maxShards > testCount) testCount else maxShards

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

@@ -296,6 +296,27 @@ class ShardTest {
         assertTrue(shards.flatMap { it.testMethods }.map { it.time }.filter { it == 0.0 }.count() == 1)
         shards.forEach { assertEquals(10.0, it.time, 0.0) }
     }
+
+    @Test
+    fun `tests annotated with @Ignore should not produce additional shards`() {
+        val androidMockedArgs = mockk<IosArgs>()
+        every { androidMockedArgs.maxTestShards } returns 50
+        every { androidMockedArgs.shardTime } returns -1
+
+        val testsToRun = listOf(
+            FlankTestMethod("a/a", ignored = true),
+            FlankTestMethod("b/b", ignored = true),
+            FlankTestMethod("c/c", ignored = true)
+        )
+
+        val oldTestResult = newSuite(mutableListOf())
+
+        val shardCount = Shard.shardCountByTime(testsToRun, oldTestResult, androidMockedArgs)
+        assertEquals(-1, shardCount)
+
+        val shards = Shard.createShardsByShardCount(testsToRun, oldTestResult, androidMockedArgs, shardCount)
+        assertEquals(1, shards.size)
+    }
 }
 
 private fun listOfFlankTestMethod(vararg args: String) = listOf(*args).map { FlankTestMethod(it) }