CORDA-540: Prevent "node" unit tests hanging in AMQP mode (#1402)

node/src/test/kotlin/net/corda/node/CordaRPCOpsImplTest.kt

@@ -73,6 +73,9 @@ class CordaRPCOpsImplTest {
                 startFlowPermission<CashIssueFlow>(),
                 startFlowPermission<CashPaymentFlow>()
         ))))
+
+        mockNet.runNetwork()
+        networkMap.ensureRegistered()
     }
 
     @After

node/src/test/kotlin/net/corda/node/messaging/TwoPartyTradeFlowTests.kt

@@ -334,6 +334,9 @@ class TwoPartyTradeFlowTests {
         val bankNode = makeNodeWithTracking(notaryNode.network.myAddress, BOC.name)
         val issuer = bankNode.info.legalIdentity.ref(1, 2, 3)
 
+        mockNet.runNetwork()
+        notaryNode.ensureRegistered()
+
         val allNodes = listOf(notaryNode, aliceNode, bobNode, bankNode)
         allNodes.forEach { node ->
             allNodes.map { it.services.myInfo.legalIdentityAndCert }.forEach { identity -> node.services.identityService.verifyAndRegisterIdentity(identity) }
@@ -440,6 +443,9 @@ class TwoPartyTradeFlowTests {
         val bankNode = makeNodeWithTracking(notaryNode.network.myAddress, BOC.name)
         val issuer = bankNode.info.legalIdentity.ref(1, 2, 3)
 
+        mockNet.runNetwork()
+        notaryNode.ensureRegistered()
+
         val allNodes = listOf(notaryNode, aliceNode, bobNode, bankNode)
         allNodes.forEach { node ->
             allNodes.map { it.services.myInfo.legalIdentityAndCert }.forEach { identity -> node.services.identityService.verifyAndRegisterIdentity(identity) }
@@ -595,6 +601,9 @@ class TwoPartyTradeFlowTests {
         val bankNode = mockNet.createPartyNode(notaryNode.network.myAddress, BOC.name)
         val issuer = bankNode.info.legalIdentity.ref(1, 2, 3)
 
+        mockNet.runNetwork()
+        notaryNode.ensureRegistered()
+
         // Let the nodes know about each other - normally the network map would handle this
         val allNodes = listOf(notaryNode, aliceNode, bobNode, bankNode)
         allNodes.forEach { node ->

node/src/test/kotlin/net/corda/node/services/NotaryChangeTests.kt

@@ -46,6 +46,7 @@ class NotaryChangeTests {
         newNotaryNode = mockNet.createNode(networkMapAddress = oldNotaryNode.network.myAddress, advertisedServices = ServiceInfo(SimpleNotaryService.type))
 
         mockNet.runNetwork() // Clear network map registration messages
+        oldNotaryNode.ensureRegistered()
     }
 
     @After

node/src/test/kotlin/net/corda/node/services/events/ScheduledFlowTests.kt

@@ -105,6 +105,9 @@ class ScheduledFlowTests {
                 advertisedServices = *arrayOf(ServiceInfo(NetworkMapService.type), ServiceInfo(ValidatingNotaryService.type)))
         nodeA = mockNet.createNode(notaryNode.network.myAddress, start = false)
         nodeB = mockNet.createNode(notaryNode.network.myAddress, start = false)
+
+        notaryNode.ensureRegistered()
+
         mockNet.startNodes()
     }
 

node/src/test/kotlin/net/corda/node/services/statemachine/FlowFrameworkTests.kt

@@ -73,6 +73,10 @@ class FlowFrameworkTests {
     fun start() {
         node1 = mockNet.createNode(advertisedServices = ServiceInfo(NetworkMapService.type))
         node2 = mockNet.createNode(networkMapAddress = node1.network.myAddress)
+
+        mockNet.runNetwork()
+        node1.ensureRegistered()
+
         // We intentionally create our own notary and ignore the one provided by the network
         val notaryKeyPair = generateKeyPair()
         val notaryService = ServiceInfo(ValidatingNotaryService.type, getTestX509Name("notary-service-2000"))

node/src/test/kotlin/net/corda/node/services/transactions/NotaryServiceTests.kt

@@ -40,6 +40,7 @@ class NotaryServiceTests {
                 advertisedServices = *arrayOf(ServiceInfo(NetworkMapService.type), ServiceInfo(SimpleNotaryService.type)))
         clientNode = mockNet.createNode(notaryNode.network.myAddress)
         mockNet.runNetwork() // Clear network map registration messages
+        notaryNode.ensureRegistered()
     }
 
     @After

node/src/test/kotlin/net/corda/node/services/transactions/ValidatingNotaryServiceTests.kt

@@ -42,6 +42,7 @@ class ValidatingNotaryServiceTests {
         )
         clientNode = mockNet.createNode(notaryNode.network.myAddress)
         mockNet.runNetwork() // Clear network map registration messages
+        notaryNode.ensureRegistered()
     }
 
     @After