diff --git a/client/rpc/src/integration-test/kotlin/net/corda/client/rpc/RPCStabilityTests.kt b/client/rpc/src/integration-test/kotlin/net/corda/client/rpc/RPCStabilityTests.kt index 6875840d04..e476e0e581 100644 --- a/client/rpc/src/integration-test/kotlin/net/corda/client/rpc/RPCStabilityTests.kt +++ b/client/rpc/src/integration-test/kotlin/net/corda/client/rpc/RPCStabilityTests.kt @@ -70,7 +70,11 @@ class RPCStabilityTests { private fun waitUntilNumberOfThreadsStable(executorService: ScheduledExecutorService): Map> { val values = ConcurrentLinkedQueue>>() return poll(executorService, "number of threads to become stable", 250.millis) { - values.add(Thread.getAllStackTraces().mapValues { it.value.toList() }) + // Exclude threads which we don't use for timing our tests + val map: Map> = Thread.getAllStackTraces() + .filterKeys { !it.name.contains("ForkJoinPool.commonPool") } + .mapValues { it.value.toList() } + values.add(map) if (values.size > 5) { values.poll() } diff --git a/node/src/integration-test-slow/kotlin/net/corda/node/services/rpc/RpcReconnectTests.kt b/node/src/integration-test-slow/kotlin/net/corda/node/services/rpc/RpcReconnectTests.kt index 9ec17b4bf8..5c3f103377 100644 --- a/node/src/integration-test-slow/kotlin/net/corda/node/services/rpc/RpcReconnectTests.kt +++ b/node/src/integration-test-slow/kotlin/net/corda/node/services/rpc/RpcReconnectTests.kt @@ -54,8 +54,8 @@ import kotlin.test.currentStackTrace class RpcReconnectTests { companion object { - // 150 flows take ~5 minutes - const val NUMBER_OF_FLOWS_TO_RUN = 150 + // this many flows take ~5 minutes + const val NUMBER_OF_FLOWS_TO_RUN = 100 private val log = contextLogger() }