ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-21 08:40:03 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'open/master' into bogdan-merge-20-03-18

Browse Source 
# Conflicts:
#	docs/source/changelog.rst
This commit is contained in:
bpaunescu
2018-03-20 16:54:56 +00:00
parent 8a62af57e6 ac9cb59a6e
commit aaa9e8c83f
10 changed files with 116 additions and 29 deletions
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

@ -22,6 +22,7 @@ import net.corda.core.serialization.serialize
import net.corda.core.utilities.*
import net.corda.node.services.messaging.RPCServerConfiguration
import net.corda.nodeapi.RPCApi
import net.corda.nodeapi.eventually
import net.corda.testing.core.SerializationEnvironmentRule
import net.corda.testing.internal.testThreadFactory
import net.corda.testing.node.internal.*
@ -257,9 +258,8 @@ class RPCStabilityTests {
assertEquals("pong", client.ping())
serverFollower.shutdown()
startRpcServer<ReconnectOps>(ops = ops, customPort = serverPort).getOrThrow()
Thread.sleep(1000) //wait for the server to come back up
val pingFuture = pool.fork(client::ping)
assertEquals("pong", pingFuture.getOrThrow(10.seconds))
val response = eventually<RPCException, String>(10.seconds) { client.ping() }
assertEquals("pong", response)
clientFollower.shutdown() // Driver would do this after the new server, causing hang.
}
}