ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-19 13:08:04 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #6232 from corda/rfowler-os-4.5-os-4.6-20200511

Browse Source 
Rfowler os 4.5 os 4.6 20200511
This commit is contained in:
Rick Parker 2020-05-11 17:51:21 +01:00 committed by GitHub
commit d4cb0e2d87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/rpc/src/integration-test/kotlin/net/corda/client/rpc/RPCStabilityTests.kt
View File

@ -70,7 +70,11 @@ class RPCStabilityTests {
private fun waitUntilNumberOfThreadsStable(executorService: ScheduledExecutorService): Map<Thread, List<StackTraceElement>> {
val values = ConcurrentLinkedQueue<Map<Thread, List<StackTraceElement>>>()
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, List<StackTraceElement>> = Thread.getAllStackTraces()
.filterKeys { !it.name.contains("ForkJoinPool.commonPool") }
.mapValues { it.value.toList() }
values.add(map)
if (values.size > 5) {
values.poll()
}

4
node/src/integration-test-slow/kotlin/net/corda/node/services/rpc/RpcReconnectTests.kt
View File

@ -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()
}