ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-05-31 14:40:52 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix intermittent "Address already in use" test failures since RPC port split. (#387)

Browse Source
This commit is contained in:
Chris Rankin 2017-03-20 09:36:34 +00:00 committed by GitHub
parent a2db6d0f5d
commit 4ce2d65964
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test-utils/src/main/kotlin/net/corda/testing/node/NodeBasedTest.kt
View File

@ -15,7 +15,6 @@ import net.corda.node.services.config.FullNodeConfiguration
import net.corda.node.services.transactions.RaftValidatingNotaryService import net.corda.node.services.transactions.RaftValidatingNotaryService
import net.corda.node.utilities.ServiceIdentityGenerator import net.corda.node.utilities.ServiceIdentityGenerator
import net.corda.testing.MOCK_NODE_VERSION_INFO import net.corda.testing.MOCK_NODE_VERSION_INFO
import net.corda.testing.freeLocalHostAndPort
import net.corda.testing.getFreeLocalPorts import net.corda.testing.getFreeLocalPorts
import org.junit.After import org.junit.After
import org.junit.Rule import org.junit.Rule
@ -116,13 +115,14 @@ abstract class NodeBasedTest {
rpcUsers: List<User>, rpcUsers: List<User>,
configOverrides: Map<String, Any>): Node { configOverrides: Map<String, Any>): Node {
val baseDirectory = (tempFolder.root.toPath() / legalName).createDirectories() val baseDirectory = (tempFolder.root.toPath() / legalName).createDirectories()
val localPort = getFreeLocalPorts("localhost", 2)
val config = ConfigHelper.loadConfig( val config = ConfigHelper.loadConfig(
baseDirectory = baseDirectory, baseDirectory = baseDirectory,
allowMissingConfig = true, allowMissingConfig = true,
configOverrides = mapOf( configOverrides = mapOf(
"myLegalName" to legalName, "myLegalName" to legalName,
"p2pAddress" to freeLocalHostAndPort().toString(), "p2pAddress" to localPort[0].toString(),
"rpcAddress" to freeLocalHostAndPort().toString(), "rpcAddress" to localPort[1].toString(),
"extraAdvertisedServiceIds" to advertisedServices.map { it.toString() }, "extraAdvertisedServiceIds" to advertisedServices.map { it.toString() },
"rpcUsers" to rpcUsers.map { "rpcUsers" to rpcUsers.map {
mapOf( mapOf(