From fbac6d7042df47c61d2714f3764bb91485a9c96b Mon Sep 17 00:00:00 2001
From: Chris Rankin <chris.rankin@r3.com>
Date: Wed, 18 Jul 2018 10:24:57 +0100
Subject: [PATCH] Remove RandomFree reference to fix merge.

---
 .../corda/node/services/TimedFlowMultiThreadedSMMTests.kt    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/node/src/integration-test/kotlin/net/corda/node/services/TimedFlowMultiThreadedSMMTests.kt b/node/src/integration-test/kotlin/net/corda/node/services/TimedFlowMultiThreadedSMMTests.kt
index 89b64b1106..4a3e8064d0 100644
--- a/node/src/integration-test/kotlin/net/corda/node/services/TimedFlowMultiThreadedSMMTests.kt
+++ b/node/src/integration-test/kotlin/net/corda/node/services/TimedFlowMultiThreadedSMMTests.kt
@@ -32,7 +32,6 @@ import net.corda.testing.core.singleIdentity
 import net.corda.testing.driver.DriverParameters
 import net.corda.testing.driver.NodeHandle
 import net.corda.testing.driver.driver
-import net.corda.testing.driver.internal.RandomFree
 import net.corda.testing.internal.IntegrationTest
 import net.corda.testing.internal.IntegrationTestSchemas
 import net.corda.testing.internal.toDatabaseSchemaName
@@ -65,7 +64,7 @@ class TimedFlowMultiThreadedSMMTests : IntegrationTest() {
     @Test
     fun `timed flow is retried`() {
         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(
                     "timeout" to Duration.ofSeconds(3),
                     "maxRestartCount" to 2,
@@ -86,7 +85,7 @@ class TimedFlowMultiThreadedSMMTests : IntegrationTest() {
     @Test
     fun `progress tracker is preserved after flow is retried`() {
         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(
                     "timeout" to Duration.ofSeconds(2),