From a1616767b8868995f3d7a3c4ccb7e0a6de797054 Mon Sep 17 00:00:00 2001 From: Tudor Malene Date: Mon, 14 May 2018 17:17:48 +0100 Subject: [PATCH] Fix merge --- .../doorman/NetworkParametersUpdateTest.kt | 9 +-- .../doorman/NodeRegistrationTest.kt | 7 +- .../kotlin/net/corda/testing/driver/Driver.kt | 68 ++++++++++++++++++- 3 files changed, 75 insertions(+), 9 deletions(-) diff --git a/network-management/src/integration-test/kotlin/com/r3/corda/networkmanage/doorman/NetworkParametersUpdateTest.kt b/network-management/src/integration-test/kotlin/com/r3/corda/networkmanage/doorman/NetworkParametersUpdateTest.kt index 76c936cad8..993985a985 100644 --- a/network-management/src/integration-test/kotlin/com/r3/corda/networkmanage/doorman/NetworkParametersUpdateTest.kt +++ b/network-management/src/integration-test/kotlin/com/r3/corda/networkmanage/doorman/NetworkParametersUpdateTest.kt @@ -95,11 +95,12 @@ class NetworkParametersUpdateTest : IntegrationTest() { compatibilityZone = compatibilityZone, notarySpecs = emptyList(), initialiseSerialization = false, - extraCordappPackagesToScan = listOf("net.corda.finance") + extraCordappPackagesToScan = listOf("net.corda.finance"), + notaryCustomOverrides = mapOf("devMode" to false) ) { var (alice, bob) = listOf( - startNode(providedName = ALICE_NAME), - startNode(providedName = BOB_NAME) + startNode(providedName = ALICE_NAME, customOverrides = mapOf("devMode" to false)), + startNode(providedName = BOB_NAME, customOverrides = mapOf("devMode" to false)) ).map { it.getOrThrow() as NodeHandleInternal } // Make sure that stopping Bob doesn't remove him from the network map @@ -139,7 +140,7 @@ class NetworkParametersUpdateTest : IntegrationTest() { applyNetworkParametersAndStart(NetworkParametersCmd.FlagDay) alice.stop() - alice = startNode(providedName = ALICE_NAME).getOrThrow() as NodeHandleInternal + alice = startNode(providedName = ALICE_NAME, customOverrides = mapOf("devMode" to false)).getOrThrow() as NodeHandleInternal // TODO It is also possible to check what version of parameters node runs by writing flow that reads that value from ServiceHub val networkParameters = (alice.configuration.baseDirectory / NETWORK_PARAMS_FILE_NAME) diff --git a/network-management/src/integration-test/kotlin/com/r3/corda/networkmanage/doorman/NodeRegistrationTest.kt b/network-management/src/integration-test/kotlin/com/r3/corda/networkmanage/doorman/NodeRegistrationTest.kt index 61d280eaf1..fa1be7a347 100644 --- a/network-management/src/integration-test/kotlin/com/r3/corda/networkmanage/doorman/NodeRegistrationTest.kt +++ b/network-management/src/integration-test/kotlin/com/r3/corda/networkmanage/doorman/NodeRegistrationTest.kt @@ -130,17 +130,18 @@ class NodeRegistrationTest : IntegrationTest() { compatibilityZone = compatibilityZone, initialiseSerialization = false, notarySpecs = listOf(NotarySpec(notaryName)), - extraCordappPackagesToScan = listOf("net.corda.finance") + extraCordappPackagesToScan = listOf("net.corda.finance"), + notaryCustomOverrides = mapOf("devMode" to false) ) { val (alice, notary) = listOf( - startNode(providedName = aliceName), + startNode(providedName = aliceName, customOverrides = mapOf("devMode" to false)), defaultNotaryNode ).map { it.getOrThrow() as NodeHandleInternal } alice.onlySeesFromNetworkMap(alice, notary) notary.onlySeesFromNetworkMap(alice, notary) - val genevieve = startNode(providedName = genevieveName).getOrThrow() as NodeHandleInternal + val genevieve = startNode(providedName = genevieveName, customOverrides = mapOf("devMode" to false)).getOrThrow() as NodeHandleInternal // Wait for the nodes to poll again Thread.sleep(timeoutMillis * 2) diff --git a/testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt b/testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt index 1af3231dbd..3cd9b47c6d 100644 --- a/testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt +++ b/testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt @@ -289,7 +289,39 @@ data class DriverParameters( notarySpecs, extraCordappPackagesToScan, jmxPolicy, - networkParameters, emptyMap() + networkParameters, + emptyMap() + ) + + constructor( + isDebug: Boolean, + driverDirectory: Path, + portAllocation: PortAllocation, + debugPortAllocation: PortAllocation, + systemProperties: Map, + useTestClock: Boolean, + initialiseSerialization: Boolean, + startNodesInProcess: Boolean, + waitForAllNodesToFinish: Boolean, + notarySpecs: List, + extraCordappPackagesToScan: List, + jmxPolicy: JmxPolicy, + networkParameters: NetworkParameters + ) : this( + isDebug, + driverDirectory, + portAllocation, + debugPortAllocation, + systemProperties, + useTestClock, + initialiseSerialization, + startNodesInProcess, + waitForAllNodesToFinish, + notarySpecs, + extraCordappPackagesToScan, + jmxPolicy, + networkParameters, + emptyMap() ) fun withIsDebug(isDebug: Boolean): DriverParameters = copy(isDebug = isDebug) @@ -333,6 +365,38 @@ data class DriverParameters( notarySpecs, extraCordappPackagesToScan, jmxPolicy, - networkParameters, emptyMap() + networkParameters, + emptyMap() + ) + + fun copy( + isDebug: Boolean, + driverDirectory: Path, + portAllocation: PortAllocation, + debugPortAllocation: PortAllocation, + systemProperties: Map, + useTestClock: Boolean, + initialiseSerialization: Boolean, + startNodesInProcess: Boolean, + waitForAllNodesToFinish: Boolean, + notarySpecs: List, + extraCordappPackagesToScan: List, + jmxPolicy: JmxPolicy, + networkParameters: NetworkParameters + ) = this.copy( + isDebug, + driverDirectory, + portAllocation, + debugPortAllocation, + systemProperties, + useTestClock, + initialiseSerialization, + startNodesInProcess, + waitForAllNodesToFinish, + notarySpecs, + extraCordappPackagesToScan, + jmxPolicy, + networkParameters, + emptyMap() ) }