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

Fix flaky test. (#4586)

Browse Source 
* Fix flaky test.

* Address code review comments.
This commit is contained in:
Tudor Malene 2019-01-16 12:02:40 +00:00 committed by GitHub
parent 3675fb2783
commit 03cff6bd00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
View File

@ -27,6 +27,7 @@ import org.junit.*
import org.junit.Assert.assertEquals import org.junit.Assert.assertEquals
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.junit.runners.Parameterized import org.junit.runners.Parameterized
import java.lang.AssertionError
import java.net.URL import java.net.URL
import java.nio.file.Files import java.nio.file.Files
import java.time.Instant import java.time.Instant
@ -225,11 +226,23 @@ class NetworkMapTest(var initFunc: (URL, NetworkMapServer) -> CompatibilityZoneP
systemProperties = mapOf("net.corda.node.internal.nodeinfo.publish.interval" to 1.seconds.toString()) systemProperties = mapOf("net.corda.node.internal.nodeinfo.publish.interval" to 1.seconds.toString())
) { ) {
val aliceNode = startNode(providedName = ALICE_NAME, devMode = false).getOrThrow() val aliceNode = startNode(providedName = ALICE_NAME, devMode = false).getOrThrow()
assertThat(networkMapServer.networkMapHashes()).contains(aliceNode.nodeInfo.serialize().hash) val aliceNodeInfo = aliceNode.nodeInfo.serialize().hash
assertThat(networkMapServer.networkMapHashes()).contains(aliceNodeInfo)
networkMapServer.removeNodeInfo(aliceNode.nodeInfo) networkMapServer.removeNodeInfo(aliceNode.nodeInfo)
assertThat(networkMapServer.networkMapHashes()).doesNotContain(aliceNode.nodeInfo.serialize().hash)
var maxRemoveRetries = 5
// Try to remove multiple times in case the network map republishes just in between the removal and the check.
while (aliceNodeInfo in networkMapServer.networkMapHashes()) {
networkMapServer.removeNodeInfo(aliceNode.nodeInfo)
if (maxRemoveRetries-- == 0) {
throw AssertionError("Could not remove Node info.")
}
}
// Wait until the node info is republished.
Thread.sleep(2000) Thread.sleep(2000)
assertThat(networkMapServer.networkMapHashes()).contains(aliceNode.nodeInfo.serialize().hash) assertThat(networkMapServer.networkMapHashes()).contains(aliceNodeInfo)
} }
} }