Determining the correct merge leader and injecting MERGE event into i…

…t only
belaban · Nov 15, 2011 · 991970f · 991970f
1 parent 2ab8580
commit 991970f
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/tests/junit/org/jgroups/tests/MergeTest.java b/tests/junit/org/jgroups/tests/MergeTest.java
@@ -43,15 +43,14 @@ protected void mergeHelper(String cluster_name, String ... members) throws Excep
                 assert ch.getView().size() == 1 : "view of " + ch.getAddress() + ": " + ch.getView();
             }
 
-            System.out.println("\n==== injecting merge event ====");
-            for(String member: members) {
-                injectMergeEvent(channels, member, members);
-            }
-            for(int i=0; i < 20; i++) {
+            Address merge_leader=determineLeader(channels, members);
+            System.out.println("\n==== injecting merge event into merge leader : " + merge_leader + " ====");
+            injectMergeEvent(channels, merge_leader, members);
+            for(int i=0; i < 40; i++) {
                 System.out.print(".");
                 if(allChannelsHaveViewOf(channels, members.length))
                     break;
-                Util.sleep(500);
+                Util.sleep(1000);
             }
             System.out.println("\n");
             print(channels);