Fix flaky tests

Author: Mr3zee

karma/chrome_bin.js

@@ -21,7 +21,7 @@ config.set({
     "client": {
         captureConsole: true,
         "mocha": {
-            timeout: 10000
+            timeout: 300000
         }
     }
 });

krpc/krpc-test/build.gradle.kts

@@ -100,14 +100,6 @@ tasks.named<Delete>("clean") {
     delete(resourcesPath.walk().filter { it.isFile && it.extension == tmpExt }.toList())
 }
 
-tasks.withType<KotlinJsTest> {
-    onlyIf {
-        // for some reason browser tests don't wait for the test to complete and end immediately
-        // KRPC-166
-        !targetName.orEmpty().endsWith("browser")
-    }
-}
-
 tasks.register("moveToGold") {
     doLast {
         resourcesPath.walk().forEach {

krpc/krpc-test/src/commonMain/kotlin/kotlinx/rpc/krpc/test/KrpcTestService.kt

@@ -94,11 +94,17 @@ interface KrpcTestService {
 
     suspend fun nullableInt(v: Int?): Int?
     suspend fun nullableList(v: List<Int>?): List<Int>?
+    suspend fun nullableEnum(enum: TestEnum?): TestEnum?
     fun delayForever(): Flow<Boolean>
 
     suspend fun answerToAnything(arg: String): Int
 
     suspend fun krpc173()
 
     fun unitFlow(): Flow<Unit>
+
+    @Serializable
+    enum class TestEnum {
+        ENUM_VALUE_1, ENUM_VALUE_2
+    }
 }

krpc/krpc-test/src/commonMain/kotlin/kotlinx/rpc/krpc/test/KrpcTestServiceBackend.kt

@@ -243,6 +243,7 @@ class KrpcTestServiceBackend : KrpcTestService {
 
     override suspend fun nullableInt(v: Int?): Int? = v
     override suspend fun nullableList(v: List<Int>?): List<Int>? = v
+    override suspend fun nullableEnum(enum: KrpcTestService.TestEnum?): KrpcTestService.TestEnum? = enum
 
     override fun delayForever(): Flow<Boolean> = flow {
         emit(true)

krpc/krpc-test/src/commonMain/kotlin/kotlinx/rpc/krpc/test/KrpcTransportTestBase.kt

@@ -324,7 +324,7 @@ abstract class KrpcTransportTestBase {
 
     @Test
     fun RPC_should_be_able_to_receive_100_000_ints_in_reasonable_time() = runTest(timeout = EXTENDED_TIMEOUT) {
-        val n = 100_000
+        val n = iterations_100_000
         var counter = 0
         val last = client.getNInts(n).onEach {
             counter++
@@ -336,8 +336,8 @@ abstract class KrpcTransportTestBase {
     }
 
     @Test
-    fun RPC_should_be_able_to_receive_100_000_ints_with_batching_in_reasonable_time() = runTest {
-        val n = 100_000
+    fun RPC_should_be_able_to_receive_100_000_ints_with_batching_in_reasonable_time() = runTest(timeout = EXTENDED_TIMEOUT) {
+        val n = iterations_100_000
         assertEquals(client.getNIntsBatched(n).last().last(), n)
     }
 
@@ -400,6 +400,15 @@ abstract class KrpcTransportTestBase {
         assertEquals(listOf(1), client.nullableList(listOf(1)))
     }
 
+    @Test
+    open fun testNullableEnums() = runTest {
+        assertNull(client.nullableEnum(null))
+        assertEquals(
+            KrpcTestService.TestEnum.ENUM_VALUE_1,
+            client.nullableEnum(KrpcTestService.TestEnum.ENUM_VALUE_1),
+        )
+    }
+
     @Test
     fun testServerCallCancellation() = runTest {
         val flag: Channel<Boolean> = Channel()
@@ -500,3 +509,4 @@ abstract class KrpcTransportTestBase {
 private val EXTENDED_TIMEOUT = if (isJs) 500.seconds else 200.seconds
 
 internal expect val isJs: Boolean
+internal expect val iterations_100_000 : Int

krpc/krpc-test/src/commonTest/kotlin/kotlinx/rpc/krpc/test/LocalTransportTest.kt

@@ -65,4 +65,7 @@ class ProtoBufLocalTransportTest : LocalTransportTest() {
 
     @Test
     override fun testNullableLists(): TestResult = runTest { }
+
+    @Test
+    override fun testNullableEnums(): TestResult = runTest { }
 }

krpc/krpc-test/src/commonTest/kotlin/kotlinx/rpc/krpc/test/TransportTest.kt

@@ -258,12 +258,12 @@ class TransportTest {
 
         val server = serverOf(transports)
 
-        delay(1000)
+        withContext(Dispatchers.Default) { delay(1000) }
         val echoServices = server.registerServiceAndReturn<Echo, _> { EchoImpl() }
         assertEquals("foo", firstResult.await())
         assertEquals(1, echoServices.single().received.value)
 
-        delay(1000)
+        withContext(Dispatchers.Default) { delay(1000) }
         val secondServices = server.registerServiceAndReturn<Second, _> { SecondServer() }
         assertEquals("bar", secondResult.await())
         assertEquals(1, secondServices.single().received.value)
@@ -272,6 +272,7 @@ class TransportTest {
     }
 
     private val handshakeClassSerialName = KrpcProtocolMessage.Handshake.serializer().descriptor.serialName
+
     @Suppress("RegExpRedundantEscape") // fails on js otherwise
     private val clientHandshake = ".*\\[Client\\] \\[Send\\] \\{\"type\":\"$handshakeClassSerialName\".*".toRegex()
 
@@ -299,7 +300,7 @@ class TransportTest {
         server.registerServiceAndReturn<Second, _> { SecondServer() }
 
         client.withService<Echo>().apply { echo("foo"); echo("bar") }
-        client.withService<Second>().apply{ second("bar"); second("baz") }
+        client.withService<Second>().apply { second("bar"); second("baz") }
 
         assertEquals(1, transportInitialized.value)
         assertEquals(1, configInitialized.value)

krpc/krpc-test/src/jsMain/kotlin/kotlinx/rpc/krpc/test/KrpcTransportTestBase.js.kt

@@ -5,3 +5,4 @@
 package kotlinx.rpc.krpc.test
 
 actual val isJs: Boolean = true
+internal actual val iterations_100_000: Int = 10_000

krpc/krpc-test/src/jsTest/kotlin/kotlinx/rpc/krpc/test/TransportTest.js.kt

@@ -4,4 +4,4 @@
 
 package kotlinx.rpc.krpc.test
 
-internal actual val testIterations: Int = 100
+internal actual val testIterations: Int = 10

krpc/krpc-test/src/jvmMain/kotlin/kotlinx/rpc/krpc/test/KrpcTransportTestBase.jvm.kt

@@ -5,3 +5,4 @@
 package kotlinx.rpc.krpc.test
 
 actual val isJs: Boolean = false
+internal actual val iterations_100_000: Int = 100_000