From f3c6a110a9e0425975108cd1c699690af3f8d0b2 Mon Sep 17 00:00:00 2001
From: Bela Ban <belaban@mailbox.org>
Date: Thu, 3 Oct 2024 15:24:05 +0200
Subject: [PATCH] ns

---
 .../junit-functional/org/jgroups/protocols/GMS_MergeTest.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/junit-functional/org/jgroups/protocols/GMS_MergeTest.java b/tests/junit-functional/org/jgroups/protocols/GMS_MergeTest.java
index f1ca6423aa..7afedfb291 100644
--- a/tests/junit-functional/org/jgroups/protocols/GMS_MergeTest.java
+++ b/tests/junit-functional/org/jgroups/protocols/GMS_MergeTest.java
@@ -191,6 +191,7 @@ static void _testConcurrentMergeMultiplePartitions(String cluster_name) throws E
         JChannel[] channels=null;
         try {
             channels=create(true, cluster_name, "A", "B", "C", "D", "E", "F", "G", "H");
+            Util.waitUntilAllChannelsHaveSameView(5000, 500, channels);
             print(channels);
             View view=channels[channels.length -1].getView();
             assert view.size() == channels.length : "view is " + view;
@@ -482,7 +483,7 @@ private static JChannel[] create(boolean simple_ids, String cluster_name, String
             retval[i]=ch;
             ch.connect(cluster_name);
             if(i == 0)
-                Util.sleep(3000);
+                Util.sleep(500);
         }
         return retval;
     }