ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-18 10:46:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

INFRA-687 Change to use an out of process node (#6696)

Browse Source 
* Change to use an out of process node
* Remove exception swallowing and add package for test constants to test process
This commit is contained in:
Ben McMahon 2020-10-05 18:12:31 +01:00 committed by GitHub
parent ee8f4ce733
commit 2790e945c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
node/src/integration-test/kotlin/net/corda/node/services/events/ScheduledFlowIntegrationTests.kt
View File

@ -89,18 +89,15 @@ class ScheduledFlowIntegrationTests {
private fun MutableList<CordaFuture<*>>.getOrThrowAll() {
forEach {
try {
it.getOrThrow()
} catch (ex: Exception) {
}
it.getOrThrow()
}
}
@Test(timeout=300_000)
fun `test that when states are being spent at the same time that schedules trigger everything is processed`() {
driver(DriverParameters(
startNodesInProcess = true,
cordappsForAllNodes = listOf(DUMMY_CONTRACTS_CORDAPP, cordappWithPackages("net.corda.testMessage"), enclosedCordapp())
startNodesInProcess = false,
cordappsForAllNodes = listOf(DUMMY_CONTRACTS_CORDAPP, cordappWithPackages("net.corda.testMessage", "net.corda.testing.core"), enclosedCordapp())
)) {
val N = 23
val rpcUser = User("admin", "admin", setOf("ALL"))
@ -127,6 +124,7 @@ class ScheduledFlowIntegrationTests {
scheduledFor
).returnValue)
}
initialiseFutures.getOrThrowAll()
val spendAttemptFutures = mutableListOf<CordaFuture<*>>()
@ -134,6 +132,7 @@ class ScheduledFlowIntegrationTests {
spendAttemptFutures.add(aliceClient.proxy.startFlow(::AnotherFlow, (i).toString()).returnValue)
spendAttemptFutures.add(bobClient.proxy.startFlow(::AnotherFlow, (i + 100).toString()).returnValue)
}
spendAttemptFutures.getOrThrowAll()
// TODO: the queries below are not atomic so we need to allow enough time for the scheduler to finish. Would be better to query scheduler.
@ -144,7 +143,7 @@ class ScheduledFlowIntegrationTests {
val bobStates = bobClient.proxy.vaultQuery(ScheduledState::class.java).states.filter { it.state.data.processed }
val bobSpentStates = bobClient.proxy.vaultQuery(SpentState::class.java).states
assertEquals(aliceStates.count() + aliceSpentStates.count(), N * 2)
assertEquals(bobStates.count() + bobSpentStates.count(), N * 2)
assertEquals(aliceSpentStates.count(), bobSpentStates.count())