Remove RandomFree reference to fix merge.

This commit is contained in:
Chris Rankin
2018-07-18 10:24:57 +01:00
parent d54bf2f761
commit fbac6d7042

View File

@ -32,7 +32,6 @@ import net.corda.testing.core.singleIdentity
import net.corda.testing.driver.DriverParameters import net.corda.testing.driver.DriverParameters
import net.corda.testing.driver.NodeHandle import net.corda.testing.driver.NodeHandle
import net.corda.testing.driver.driver import net.corda.testing.driver.driver
import net.corda.testing.driver.internal.RandomFree
import net.corda.testing.internal.IntegrationTest import net.corda.testing.internal.IntegrationTest
import net.corda.testing.internal.IntegrationTestSchemas import net.corda.testing.internal.IntegrationTestSchemas
import net.corda.testing.internal.toDatabaseSchemaName import net.corda.testing.internal.toDatabaseSchemaName
@ -65,7 +64,7 @@ class TimedFlowMultiThreadedSMMTests : IntegrationTest() {
@Test @Test
fun `timed flow is retried`() { fun `timed flow is retried`() {
val user = User("test", "pwd", setOf(Permissions.startFlow<TimedInitiatorFlow>(), Permissions.startFlow<SuperFlow>())) val user = User("test", "pwd", setOf(Permissions.startFlow<TimedInitiatorFlow>(), Permissions.startFlow<SuperFlow>()))
driver(DriverParameters(startNodesInProcess = true, portAllocation = RandomFree)) { driver(DriverParameters(startNodesInProcess = true)) {
val configOverrides = mapOf("flowTimeout" to mapOf( val configOverrides = mapOf("flowTimeout" to mapOf(
"timeout" to Duration.ofSeconds(3), "timeout" to Duration.ofSeconds(3),
"maxRestartCount" to 2, "maxRestartCount" to 2,
@ -86,7 +85,7 @@ class TimedFlowMultiThreadedSMMTests : IntegrationTest() {
@Test @Test
fun `progress tracker is preserved after flow is retried`() { fun `progress tracker is preserved after flow is retried`() {
val user = User("test", "pwd", setOf(Permissions.startFlow<TimedInitiatorFlow>(), Permissions.startFlow<SuperFlow>())) val user = User("test", "pwd", setOf(Permissions.startFlow<TimedInitiatorFlow>(), Permissions.startFlow<SuperFlow>()))
driver(DriverParameters(startNodesInProcess = true, portAllocation = RandomFree)) { driver(DriverParameters(startNodesInProcess = true)) {
val configOverrides = mapOf("flowTimeout" to mapOf( val configOverrides = mapOf("flowTimeout" to mapOf(
"timeout" to Duration.ofSeconds(2), "timeout" to Duration.ofSeconds(2),