Merge remote-tracking branch 'open/master'

# Conflicts:
#	node/src/main/kotlin/net/corda/node/services/events/NodeSchedulerService.kt
#	node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt
This commit is contained in:
Anthony Keenan
2018-03-26 15:46:26 +01:00
9 changed files with 213 additions and 34 deletions

View File

@ -315,16 +315,21 @@ class RPCStabilityTests {
var terminateHandlerCalled = false
var errorHandlerCalled = false
var exceptionMessage: String? = null
val subscription = client.subscribe()
.doOnTerminate{ terminateHandlerCalled = true }
.doOnError { errorHandlerCalled = true }
.subscribe()
.subscribe({}, {
errorHandlerCalled = true
//log exception
exceptionMessage = it.message
})
serverFollower.shutdown()
Thread.sleep(100)
assertTrue(terminateHandlerCalled)
assertTrue(errorHandlerCalled)
assertEquals("Connection failure detected.", exceptionMessage)
assertTrue(subscription.isUnsubscribed)
clientFollower.shutdown() // Driver would do this after the new server, causing hang.