Fix bug where flag 'disable-sharding' causes bad request to TL

Flank · Feb 23, 2020 · 577e2bc · 577e2bc
1 parent 67284dd
commit 577e2bc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/test_runner/src/main/kotlin/ftl/args/AndroidTestShard.kt b/test_runner/src/main/kotlin/ftl/args/AndroidTestShard.kt
@@ -12,8 +12,6 @@ object AndroidTestShard {
 
     // computed properties not specified in yaml
     fun getTestShardChunks(args: AndroidArgs, testApk: String): List<List<String>> {
-        if (args.disableSharding) return listOf(emptyList())
-
         // Download test APK if necessary so it can be used to validate test methods
         var testLocalApk = testApk
         if (testApk.startsWith(FtlConstants.GCS_PREFIX)) {
@@ -28,7 +26,12 @@ object AndroidTestShard {
 
     private fun getTestMethods(args: AndroidArgs, testLocalApk: String): List<String> {
         val allTestMethods = DexParser.findTestMethods(testLocalApk)
-        require(allTestMethods.isNotEmpty()) { Utils.fatalError("Test APK has no tests") }
+        val shouldIgnoreMissingTests = allTestMethods.isEmpty() && args.disableSharding
+        val shouldThrowErrorIfMissingTests = allTestMethods.isEmpty() && !args.disableSharding
+        when {
+            shouldIgnoreMissingTests -> return mutableListOf()
+            shouldThrowErrorIfMissingTests -> throw IllegalStateException(Utils.fatalError("Test APK has no tests"))
+        }
         val testFilter = TestFilters.fromTestTargets(args.testTargets)
         val filteredTests = allTestMethods
             .asSequence()

diff --git a/test_runner/src/main/kotlin/ftl/args/ArgsHelper.kt b/test_runner/src/main/kotlin/ftl/args/ArgsHelper.kt
@@ -221,14 +221,15 @@ object ArgsHelper {
     }
 
     fun calculateShards(filteredTests: List<String>, args: IArgs): List<List<String>> {
-        val oldTestResult = GcStorage.downloadJunitXml(args) ?: JUnitTestResult(mutableListOf())
-
-        val shardCount = Shard.shardCountByTime(filteredTests, oldTestResult, args)
-
-        // TODO: manual sharding must be limited to 1..50 tests per shard
-        val shards = Shard.createShardsByShardCount(filteredTests, oldTestResult, args, shardCount)
+        val shards = if (args.disableSharding) {
+            mutableListOf(filteredTests as MutableList<String>)
+        } else {
+            val oldTestResult = GcStorage.downloadJunitXml(args) ?: JUnitTestResult(mutableListOf())
+            val shardCount = Shard.shardCountByTime(filteredTests, oldTestResult, args)
+            Shard.createShardsByShardCount(filteredTests, oldTestResult, args, shardCount).stringShards()
+        }
 
-        return testMethodsAlwaysRun(shards.stringShards(), args)
+        return testMethodsAlwaysRun(shards, args)
     }
 
     private fun testMethodsAlwaysRun(shards: StringShards, args: IArgs): StringShards {