Test reliability improvements (#1372)

basho · Feb 14, 2023 · 617dc7e · 617dc7e
1 parent 1587a8f
commit 617dc7e
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 16 deletions.
diff --git a/tests/nextgenrepl_bouncingtomb.erl b/tests/nextgenrepl_bouncingtomb.erl
@@ -23,7 +23,7 @@
 -define(STND_MAX_DELAY, 3600).
 -define(BIG_REPL_SLEEP, 4000).
 
--define(LOOP_COUNT, 4).
+-define(LOOP_COUNT, 5).
 -define(STATS_WAIT, 1000).
 
 

diff --git a/tests/nextgenrepl_rtq_pbsecurity.erl b/tests/nextgenrepl_rtq_pbsecurity.erl
@@ -408,21 +408,36 @@ check_all_insync({NodeA, IPA, PortA},
                     {NodeB, IPB, PortB},
                     {NodeC, IPC, PortC},
                     SSLCredentials) ->
-    {root_compare, 0}
-        = fullsync_check({NodeA, IPA, PortA, ?A_NVAL},
-                            {NodeB, IPB, PortB, ?B_NVAL},
-                            cluster_a,
-                            SSLCredentials),
-    {root_compare, 0}
-        = fullsync_check({NodeB, IPB, PortB, ?B_NVAL},
-                            {NodeC, IPC, PortC, ?C_NVAL},
-                            cluster_c,
-                            SSLCredentials),
-    {root_compare, 0}
-        = fullsync_check({NodeC, IPC, PortC, ?C_NVAL},
-                            {NodeA, IPA, PortA, ?A_NVAL},
-                            cluster_a,
-                            SSLCredentials),
+    {root_compare, 0} =
+        wait_for_outcome(
+            ?MODULE,
+            fullsync_check,
+            [{NodeA, IPA, PortA, ?A_NVAL},
+                {NodeB, IPB, PortB, ?B_NVAL},
+                cluster_b,
+                SSLCredentials],
+            {root_compare, 0},
+            ?WAIT_LOOPS),
+    {root_compare, 0} =
+        wait_for_outcome(
+            ?MODULE,
+            fullsync_check,
+            [{NodeB, IPB, PortB, ?B_NVAL},
+                {NodeC, IPC, PortC, ?C_NVAL},
+                cluster_c,
+                SSLCredentials],
+            {root_compare, 0},
+            ?WAIT_LOOPS),
+    {root_compare, 0} =
+        wait_for_outcome(
+            ?MODULE,
+            fullsync_check,
+            [{NodeC, IPC, PortC, ?C_NVAL},
+                {NodeA, IPA, PortA, ?A_NVAL},
+                cluster_a,
+                SSLCredentials],
+            {root_compare, 0},
+            ?WAIT_LOOPS),
     true.
 
 setup_srcreplqueues([], _SinkClusters, _Filter) ->