From 2c3c605d155c467f96cfeef8c7f0e65e53025063 Mon Sep 17 00:00:00 2001 From: MregXN Date: Wed, 6 Dec 2023 12:51:38 +0800 Subject: [PATCH 1/2] add delay to get everything ready Signed-off-by: MregXN --- test/e2e/common/server.test.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/test/e2e/common/server.test.ts b/test/e2e/common/server.test.ts index dd3e9515..fe3dc359 100644 --- a/test/e2e/common/server.test.ts +++ b/test/e2e/common/server.test.ts @@ -12,6 +12,7 @@ limitations under the License. */ import { CommunicationProtocolEnum, DaprServer, DaprPubSubStatusEnum } from "../../../src"; +import * as NodeJSUtil from "../../../src/utils/NodeJS.util"; const serverHost = "127.0.0.1"; const serverGrpcPort = "50001"; @@ -49,6 +50,9 @@ const bulkSubscribeClodEventTopic = "bulk-subscribe-ce-topic"; const bulkSubscribeCloudEventToRawPayloadTopic = "bulk-subscribe-ce-rp-topic"; const bulkSubscribeRawPayloadToClodEventTopic = "bulk-subscribe-rp-ce-topic"; +// Set timeout to 10s for all tests +jest.setTimeout(10000); + describe("common/server", () => { let httpServer: DaprServer; let grpcServer: DaprServer; @@ -134,9 +138,13 @@ describe("common/server", () => { }); await setupPubSubSubscriptions(); + // Sleep for 2 seconds to allow all subscriptions to be registered + await NodeJSUtil.sleep(2000); await httpServer.start(); await grpcServer.start(); + // Sleep for 2 seconds to get servers ready + await NodeJSUtil.sleep(2000); }); beforeEach(() => { @@ -161,7 +169,7 @@ describe("common/server", () => { const res = await server.client.pubsub.publish(pubSubName, getTopic(topicWithStatusCb, protocol), "SUCCESS"); expect(res.error).toBeUndefined(); // Delay a bit for event to arrive - await new Promise((resolve, _reject) => setTimeout(resolve, 1000)); + await new Promise((resolve, _reject) => setTimeout(resolve, 2000)); expect(mockSubscribeStatusHandler.mock.calls.length).toBe(1); expect(mockSubscribeStatusHandler.mock.calls[0][1]).toEqual("SUCCESS"); expect(mockSubscribeDeadletterHandler.mock.calls.length).toBe(0); From 76cd8b5136cddcae41a7493f62648b2f77179298 Mon Sep 17 00:00:00 2001 From: MregXN <46479059+MregXN@users.noreply.github.com> Date: Wed, 13 Dec 2023 17:13:39 +0800 Subject: [PATCH 2/2] Update test/e2e/common/server.test.ts Co-authored-by: Shubham Sharma Signed-off-by: MregXN <46479059+MregXN@users.noreply.github.com> --- test/e2e/common/server.test.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/e2e/common/server.test.ts b/test/e2e/common/server.test.ts index fe3dc359..c962b282 100644 --- a/test/e2e/common/server.test.ts +++ b/test/e2e/common/server.test.ts @@ -138,7 +138,8 @@ describe("common/server", () => { }); await setupPubSubSubscriptions(); - // Sleep for 2 seconds to allow all subscriptions to be registered + // Sleep to make the tests less flaky. + // TODO: https://github.com/dapr/js-sdk/issues/560 await NodeJSUtil.sleep(2000); await httpServer.start();