ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-06 02:59:15 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

BUILD: Try to fix flaky FailNodeOnNotMigratedAttachmentContractsTableNameTests.

Browse Source 
* Ensure that this test stops nodes that it starts.
* Also ensure that random ephemeral ports can be reused.
This commit is contained in:
Chris Rankin 2019-03-18 17:25:01 +00:00 committed by Mike Hearn
parent 866f07c741
commit f378f0eba6
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
node/src/integration-test/kotlin/net/corda/node/persistence/FailNodeOnNotMigratedAttachmentContractsTableNameTests.kt
View File

@ -14,7 +14,6 @@ import net.corda.testing.driver.DriverParameters
import net.corda.testing.driver.driver import net.corda.testing.driver.driver
import net.corda.testing.driver.internal.RandomFree import net.corda.testing.driver.internal.RandomFree
import net.corda.testing.node.User import net.corda.testing.node.User
import org.assertj.core.api.Assertions
import org.assertj.core.api.Assertions.assertThatThrownBy import org.assertj.core.api.Assertions.assertThatThrownBy
import org.junit.Test import org.junit.Test
import java.nio.file.Path import java.nio.file.Path
@ -36,19 +35,19 @@ class FailNodeOnNotMigratedAttachmentContractsTableNameTests {
val user = User("mark", "dadada", setOf(Permissions.startFlow<SendMessageFlow>(), Permissions.invokeRpc("vaultQuery"))) val user = User("mark", "dadada", setOf(Permissions.startFlow<SendMessageFlow>(), Permissions.invokeRpc("vaultQuery")))
val message = Message("Hello world!") val message = Message("Hello world!")
val baseDir: Path = driver(DriverParameters(startNodesInProcess = true, portAllocation = RandomFree, extraCordappPackagesToScan = listOf(MessageState::class.packageName))) { val baseDir: Path = driver(DriverParameters(startNodesInProcess = true, portAllocation = RandomFree, extraCordappPackagesToScan = listOf(MessageState::class.packageName))) {
// Just start a node to make this test less flaky. val (nodeName, baseDir) = run {
startNode(rpcUsers = listOf(user)).getOrThrow()
val (nodeName, baseDir) = {
defaultNotaryNode.getOrThrow() defaultNotaryNode.getOrThrow()
val nodeHandle = startNode(rpcUsers = listOf(user)).getOrThrow() val nodeHandle = startNode(rpcUsers = listOf(user)).getOrThrow()
val nodeName = nodeHandle.nodeInfo.singleIdentity().name val nodeName = try {
CordaRPCClient(nodeHandle.rpcAddress).start(user.username, user.password).use { CordaRPCClient(nodeHandle.rpcAddress).start(user.username, user.password).use {
it.proxy.startFlow(::SendMessageFlow, message, defaultNotaryIdentity).returnValue.getOrThrow() it.proxy.startFlow(::SendMessageFlow, message, defaultNotaryIdentity).returnValue.getOrThrow()
}
nodeHandle.nodeInfo.singleIdentity().name
} finally {
nodeHandle.stop()
} }
nodeHandle.stop()
Pair(nodeName, nodeHandle.baseDirectory) Pair(nodeName, nodeHandle.baseDirectory)
}() }
// replace the correct table name with one from the former release // replace the correct table name with one from the former release
DriverManager.getConnection("jdbc:h2:file://$baseDir/persistence", "sa", "").use { DriverManager.getConnection("jdbc:h2:file://$baseDir/persistence", "sa", "").use {

1
testing/node-driver/src/main/kotlin/net/corda/testing/driver/internal/DriverInternal.kt
View File

@ -81,6 +81,7 @@ val InProcess.internalServices: StartedNodeServices get() = services as StartedN
object RandomFree : PortAllocation() { object RandomFree : PortAllocation() {
override fun nextPort(): Int { override fun nextPort(): Int {
return ServerSocket().use { return ServerSocket().use {
it.reuseAddress = true
it.bind(InetSocketAddress(0)) it.bind(InetSocketAddress(0))
it.localPort it.localPort
} }