From 69ce61fe3e7e2580ac16a2637356957c6303c546 Mon Sep 17 00:00:00 2001
From: Bret Ambrose <bambrose@amazon.com>
Date: Fri, 1 Dec 2023 14:24:12 -0800
Subject: [PATCH] Fix some canary issues

---
 canary/mqtt5/canary.ts | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/canary/mqtt5/canary.ts b/canary/mqtt5/canary.ts
index a60e6eb4..1d01a41c 100644
--- a/canary/mqtt5/canary.ts
+++ b/canary/mqtt5/canary.ts
@@ -76,7 +76,7 @@ interface CanaryContext {
 }
 
 function sleep(millisecond: number) {
-    return new Promise((resolve) => setInterval(resolve, millisecond));
+    return new Promise((resolve) => setTimeout(resolve, millisecond));
 }
 
 function getRandomIndex(clients : mqtt5.Mqtt5Client[]): number
@@ -192,7 +192,7 @@ async function runCanary(testContext: TestContext, mqttStats: CanaryMqttStatisti
     };
 
     // Start clients
-    context.clients.forEach( async client => {
+    for (let client of context.clients) {
         client.start();
         const connectionSuccess = once(client, "connectionSuccess");
 
@@ -205,7 +205,7 @@ async function runCanary(testContext: TestContext, mqttStats: CanaryMqttStatisti
         });
         // setup empty subscription string array
         context.subscriptions.push(new Array());
-    });
+    }
 
     let operationTable = [
         { weight : 1, op: async () => { await doSubscribe(context); }},
@@ -214,7 +214,7 @@ async function runCanary(testContext: TestContext, mqttStats: CanaryMqttStatisti
         { weight : 20, op: async () => { await doPublish(context, mqtt5.QoS.AtLeastOnce); }}
     ];
 
-    var weightedOperations = operationTable.map(function (operation) {
+    let weightedOperations = operationTable.map(function (operation) {
         return operation.weight;
     });
 
@@ -232,13 +232,12 @@ async function runCanary(testContext: TestContext, mqttStats: CanaryMqttStatisti
 
 
     // Stop and close clients
-    context.clients.forEach( async client => {
+    for (let client of context.clients) {
         const stopped = once(client, "stopped");
         client.stop();
         await stopped;
         client.close();
-    });
-
+    }
 }
 
 async function main(args : Args){