Increase timeouts for tip height waiting

tari-project · Oct 24, 2021 · 9e6fc82 · 9e6fc82
1 parent ea100fb
commit 9e6fc82
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/integration_tests/features/support/steps.js b/integration_tests/features/support/steps.js
@@ -15,6 +15,7 @@ const {
   consoleLogBalance,
   consoleLogTransactionDetails,
   withTimeout,
+  waitForIterate,
 } = require("../../helpers/util");
 const { ConnectivityStatus, PaymentType } = require("../../helpers/types");
 const TransactionBuilder = require("../../helpers/transactionBuilder");
@@ -830,14 +831,15 @@ When(/I stop node (.*)/, async function (name) {
 
 Then(
   /node (.*) is at height (\d+)/,
-  { timeout: 120 * 1000 },
+  { timeout: 210 * 1000 },
   async function (name, height) {
     const client = this.getClient(name);
-    await waitForPredicate(
-      async () => (await client.getTipHeight()) === height,
-      115 * 1000
+    const currentHeight = await waitForIterate(
+      () => client.getTipHeight(),
+      height,
+      1000,
+      200
     );
-    const currentHeight = await client.getTipHeight();
     console.log(
       `Node ${name} is at tip: ${currentHeight} (should be`,
       height,
@@ -900,10 +902,7 @@ Then(
   async function (height) {
     let tipHash = null;
     await this.forEachClientAsync(async (client, name) => {
-      await waitForPredicate(
-        async () => (await client.getTipHeight()) === height,
-        115 * 1000
-      );
+      await waitForIterate(() => client.getTipHeight(), height, 200 * 1000);
       const currTip = await client.getTipHeader();
       console.log(
         `${client.name} is at tip ${currTip.height} (${currTip.hash.toString(
@@ -994,7 +993,7 @@ Then(
   async function (node) {
     const client = this.getClient(node);
     await waitForPredicate(
-      async () => (await client.initial_sync_achieved()) === true,
+      async () => await client.initial_sync_achieved(),
       20 * 60 * 1000,
       1000
     );

diff --git a/integration_tests/helpers/util.js b/integration_tests/helpers/util.js
@@ -110,16 +110,17 @@ async function waitFor(
 
 async function waitForIterate(testFn, toBe, sleepMs, maxIterations = 500) {
   let count = 0;
-  let val = testFn();
-  while (!(val === toBe)) {
-    val = testFn();
+  let val = await Promise.resolve(testFn());
+  while (val !== toBe) {
+    val = await Promise.resolve(testFn());
     if (count >= maxIterations) {
       break;
     }
     count++;
     await sleep(sleepMs);
     process.stdout.write(".");
   }
+  return val;
 }
 
 async function waitForPredicate(predicate, timeOut, sleepMs = 500) {