From 8aee27a724cfef6f2b269e7ab37544b5dff77651 Mon Sep 17 00:00:00 2001
From: pm47 <pm.padiou@gmail.com>
Date: Wed, 18 May 2022 13:52:51 +0200
Subject: [PATCH] improve debuggability of integration tests

---
 .../integration/PaymentIntegrationSpec.scala  | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/eclair-core/src/test/scala/fr/acinq/eclair/integration/PaymentIntegrationSpec.scala b/eclair-core/src/test/scala/fr/acinq/eclair/integration/PaymentIntegrationSpec.scala
index 1d3399145c..a62b91a998 100644
--- a/eclair-core/src/test/scala/fr/acinq/eclair/integration/PaymentIntegrationSpec.scala
+++ b/eclair-core/src/test/scala/fr/acinq/eclair/integration/PaymentIntegrationSpec.scala
@@ -117,19 +117,21 @@ class PaymentIntegrationSpec extends IntegrationSpec {
   def awaitAnnouncements(subset: Map[String, Kit], nodes: Int, channels: Int, updates: Int): Unit = {
     val sender = TestProbe()
     subset.foreach {
-      case (_, setup) =>
-        awaitCond({
-          sender.send(setup.router, Router.GetNodes)
-          sender.expectMsgType[Iterable[NodeAnnouncement]].size == nodes
-        }, max = 60 seconds, interval = 1 second)
-        awaitCond({
-          sender.send(setup.router, Router.GetChannels)
-          sender.expectMsgType[Iterable[ChannelAnnouncement]].size == channels
-        }, max = 60 seconds, interval = 1 second)
-        awaitCond({
-          sender.send(setup.router, Router.GetChannelUpdates)
-          sender.expectMsgType[Iterable[ChannelUpdate]].size == updates
-        }, max = 60 seconds, interval = 1 second)
+      case (node, setup) =>
+        withClue(node) {
+          awaitAssert({
+            sender.send(setup.router, Router.GetNodes)
+            assert(sender.expectMsgType[Iterable[NodeAnnouncement]].size == nodes)
+          }, max = 10 seconds, interval = 1 second)
+          awaitAssert({
+            sender.send(setup.router, Router.GetChannels)
+            sender.expectMsgType[Iterable[ChannelAnnouncement]].size == channels
+          }, max = 10 seconds, interval = 1 second)
+          awaitAssert({
+            sender.send(setup.router, Router.GetChannelUpdates)
+            sender.expectMsgType[Iterable[ChannelUpdate]].size == updates
+          }, max = 10 seconds, interval = 1 second)
+        }
     }
   }