diff --git a/node/tests/PubSub.test.ts b/node/tests/PubSub.test.ts index 82aec7f826..68bad4cf55 100644 --- a/node/tests/PubSub.test.ts +++ b/node/tests/PubSub.test.ts @@ -260,16 +260,18 @@ describe("PubSub", () => { } async function clientCleanup( - client: TGlideClient, - clusterModeSubs?: GlideClusterClientConfiguration.PubSubSubscriptions, + client: TGlideClient | null, + subscriptions?: + | GlideClusterClientConfiguration.PubSubSubscriptions + | GlideClientConfiguration.PubSubSubscriptions, ) { if (client === null) { return; } - if (clusterModeSubs) { + if (subscriptions) { for (const [channelType, channelPatterns] of Object.entries( - clusterModeSubs.channelsAndPatterns, + subscriptions.channelsAndPatterns, )) { let cmd; @@ -291,14 +293,18 @@ describe("PubSub", () => { } for (const channelPattern of channelPatterns) { - await client.customCommand([cmd, channelPattern]); + try { + await client.customCommand([cmd, channelPattern]); + } catch (e) { + console.log("======== this ", e as Error); + } } } } client.close(); // Wait briefly to ensure closure is completed - await new Promise((resolve) => setTimeout(resolve, 1000)); + await new Promise((resolve) => setTimeout(resolve, 100)); } function newMessage(msg: PubSubMsg, context: PubSubMsg[]): void { @@ -392,10 +398,7 @@ describe("PubSub", () => { await checkNoMessagesLeft(method, listeningClient, context, 1); } finally { await clientCleanup(publishingClient!); - await clientCleanup( - listeningClient!, - clusterMode ? pubSub! : undefined, - ); + await clientCleanup(listeningClient!, pubSub!); } }, TIMEOUT, @@ -478,10 +481,7 @@ describe("PubSub", () => { await checkNoMessagesLeft(method, listeningClient, context, 1); } finally { await clientCleanup(publishingClient!); - await clientCleanup( - listeningClient!, - clusterMode ? pubSub! : undefined, - ); + await clientCleanup(listeningClient!, pubSub!); } }, TIMEOUT, @@ -560,10 +560,7 @@ describe("PubSub", () => { expect(listeningClient.tryGetPubSubMessage()).toBeNull(); } finally { await clientCleanup(publishingClient!); - await clientCleanup( - listeningClient!, - clusterMode ? pubSub! : undefined, - ); + await clientCleanup(listeningClient!, pubSub!); } }, TIMEOUT, @@ -677,16 +674,8 @@ describe("PubSub", () => { ); } finally { // Cleanup clients - if (listeningClient) { - await clientCleanup( - listeningClient, - clusterMode ? pubSub! : undefined, - ); - } - - if (publishingClient) { - await clientCleanup(publishingClient); - } + await clientCleanup(listeningClient, pubSub!); + await clientCleanup(publishingClient); } }, TIMEOUT, @@ -789,16 +778,8 @@ describe("PubSub", () => { expect(listeningClient.tryGetPubSubMessage()).toBeNull(); } finally { // Cleanup clients - if (listeningClient) { - await clientCleanup( - listeningClient, - clusterMode ? pubSub! : undefined, - ); - } - - if (publishingClient) { - await clientCleanup(publishingClient); - } + await clientCleanup(listeningClient, pubSub!); + await clientCleanup(publishingClient); } }, TIMEOUT, @@ -888,16 +869,8 @@ describe("PubSub", () => { await checkNoMessagesLeft(method, listeningClient, context, 1); } finally { // Cleanup clients - if (listeningClient) { - await clientCleanup( - listeningClient, - clusterMode ? pubSub! : undefined, - ); - } - - if (publishingClient) { - await clientCleanup(publishingClient); - } + await clientCleanup(listeningClient, pubSub!); + await clientCleanup(publishingClient); } }, TIMEOUT, @@ -984,13 +957,8 @@ describe("PubSub", () => { expect(listeningClient!.tryGetPubSubMessage()).toBeNull(); } finally { // Cleanup clients - if (listeningClient) { - await clientCleanup(listeningClient, pubSub!); - } - - if (publishingClient) { - await clientCleanup(publishingClient); - } + await clientCleanup(listeningClient, pubSub!); + await clientCleanup(publishingClient); } }, TIMEOUT, @@ -1105,16 +1073,8 @@ describe("PubSub", () => { ); } finally { // Cleanup clients - if (listeningClient) { - await clientCleanup( - listeningClient, - clusterMode ? pubSub! : undefined, - ); - } - - if (publishingClient) { - await clientCleanup(publishingClient); - } + await clientCleanup(listeningClient, pubSub!); + await clientCleanup(publishingClient); } }, TIMEOUT, @@ -1213,16 +1173,8 @@ describe("PubSub", () => { await checkNoMessagesLeft(method, listeningClient, context, 2); } finally { // Cleanup clients - if (listeningClient) { - await clientCleanup( - listeningClient, - clusterMode ? pubSub! : undefined, - ); - } - - if (publishingClient) { - await clientCleanup(publishingClient); - } + await clientCleanup(listeningClient, pubSub!); + await clientCleanup(publishingClient); } }, TIMEOUT, @@ -1315,16 +1267,8 @@ describe("PubSub", () => { expect(listeningClient.tryGetPubSubMessage()).toBeNull(); } finally { // Cleanup clients - if (listeningClient) { - await clientCleanup( - listeningClient, - clusterMode ? pubSub! : undefined, - ); - } - - if (publishingClient) { - await clientCleanup(publishingClient); - } + await clientCleanup(listeningClient, pubSub!); + await clientCleanup(publishingClient); } }, TIMEOUT, @@ -1433,16 +1377,8 @@ describe("PubSub", () => { ); } finally { // Cleanup clients - if (listeningClient) { - await clientCleanup( - listeningClient, - clusterMode ? pubSub! : undefined, - ); - } - - if (publishingClient) { - await clientCleanup(publishingClient); - } + await clientCleanup(listeningClient, pubSub!); + await clientCleanup(publishingClient); } }, TIMEOUT, @@ -1584,16 +1520,8 @@ describe("PubSub", () => { ); } finally { // Cleanup clients - if (listeningClient) { - await clientCleanup( - listeningClient, - clusterMode ? pubSub! : undefined, - ); - } - - if (publishingClient) { - await clientCleanup(publishingClient); - } + await clientCleanup(listeningClient, pubSub!); + await clientCleanup(publishingClient); } }, TIMEOUT, @@ -1785,27 +1713,10 @@ describe("PubSub", () => { ); } finally { // Cleanup clients - if (listeningClientExact) { - await clientCleanup( - listeningClientExact, - clusterMode ? pubSubExact! : undefined, - ); - } - - if (publishingClient) { - await clientCleanup(publishingClient); - } - - if (listeningClientPattern) { - await clientCleanup( - listeningClientPattern, - clusterMode ? pubSubPattern! : undefined, - ); - } - - if (clientDontCare) { - await clientCleanup(clientDontCare); - } + await clientCleanup(listeningClientExact, pubSubExact!); + await clientCleanup(publishingClient); + await clientCleanup(listeningClientPattern, pubSubPattern!); + await clientCleanup(clientDontCare); } }, TIMEOUT, @@ -1959,16 +1870,8 @@ describe("PubSub", () => { ); } finally { // Cleanup clients - if (listeningClient) { - await clientCleanup( - listeningClient, - clusterMode ? pubSub! : undefined, - ); - } - - if (publishingClient) { - await clientCleanup(publishingClient); - } + await clientCleanup(listeningClient, pubSub!); + await clientCleanup(publishingClient); } }, TIMEOUT, @@ -2213,30 +2116,10 @@ describe("PubSub", () => { ); } finally { // Cleanup clients - if (listeningClientExact) { - await clientCleanup( - listeningClientExact, - clusterMode ? pubSubExact! : undefined, - ); - } - - if (publishingClient) { - await clientCleanup(publishingClient); - } - - if (listeningClientPattern) { - await clientCleanup( - listeningClientPattern, - clusterMode ? pubSubPattern! : undefined, - ); - } - - if (listeningClientSharded) { - await clientCleanup( - listeningClientSharded, - clusterMode ? pubSubSharded! : undefined, - ); - } + await clientCleanup(listeningClientExact, pubSubExact!); + await clientCleanup(publishingClient); + await clientCleanup(listeningClientPattern, pubSubPattern!); + await clientCleanup(listeningClientSharded, pubSubSharded!); } }, TIMEOUT, @@ -2451,30 +2334,10 @@ describe("PubSub", () => { ); } finally { // Cleanup clients - if (listeningClientExact) { - await clientCleanup( - listeningClientExact, - clusterMode ? pubSubExact! : undefined, - ); - } - - if (publishingClient) { - await clientCleanup(publishingClient); - } - - if (listeningClientPattern) { - await clientCleanup( - listeningClientPattern, - clusterMode ? pubSubPattern! : undefined, - ); - } - - if (listeningClientSharded) { - await clientCleanup( - listeningClientSharded, - clusterMode ? pubSubSharded! : undefined, - ); - } + await clientCleanup(listeningClientExact, pubSubExact!); + await clientCleanup(publishingClient); + await clientCleanup(listeningClientPattern, pubSubPattern!); + await clientCleanup(listeningClientSharded, pubSubSharded!); } }, TIMEOUT, @@ -2627,19 +2490,8 @@ describe("PubSub", () => { ); } finally { // Cleanup clients - if (clientExact) { - await clientCleanup( - clientExact, - clusterMode ? pubSubExact! : undefined, - ); - } - - if (clientPattern) { - await clientCleanup( - clientPattern, - clusterMode ? pubSubPattern! : undefined, - ); - } + await clientCleanup(clientExact, pubSubExact!); + await clientCleanup(clientPattern, pubSubPattern!); } }, TIMEOUT, @@ -2847,30 +2699,10 @@ describe("PubSub", () => { ); } finally { // Cleanup clients - if (clientExact) { - await clientCleanup( - clientExact, - clusterMode ? pubSubExact! : undefined, - ); - } - - if (clientPattern) { - await clientCleanup( - clientPattern, - clusterMode ? pubSubPattern! : undefined, - ); - } - - if (clientSharded) { - await clientCleanup( - clientSharded, - clusterMode ? pubSubSharded! : undefined, - ); - } - - if (clientDontCare) { - await clientCleanup(clientDontCare, undefined); - } + await clientCleanup(clientExact, pubSubExact!); + await clientCleanup(clientPattern, pubSubPattern!); + await clientCleanup(clientSharded, pubSubSharded!); + await clientCleanup(clientDontCare); } }, TIMEOUT, @@ -2974,16 +2806,8 @@ describe("PubSub", () => { ); expect(listeningClient.tryGetPubSubMessage()).toBeNull(); } finally { - if (listeningClient) { - await clientCleanup( - listeningClient, - clusterMode ? pubSub! : undefined, - ); - } - - if (publishingClient) { - await clientCleanup(publishingClient); - } + await clientCleanup(listeningClient!, pubSub!); + await clientCleanup(publishingClient!); } }, TIMEOUT, @@ -3077,16 +2901,8 @@ describe("PubSub", () => { ); expect(listeningClient.tryGetPubSubMessage()).toBeNull(); } finally { - if (listeningClient) { - await clientCleanup( - listeningClient, - clusterMode ? pubSub! : undefined, - ); - } - - if (publishingClient) { - await clientCleanup(publishingClient); - } + await clientCleanup(listeningClient!, pubSub!); + await clientCleanup(publishingClient!); } }, TIMEOUT, @@ -3169,16 +2985,8 @@ describe("PubSub", () => { // Assert no messages left expect(callbackMessages.length).toEqual(1); } finally { - if (listeningClient) { - await clientCleanup( - listeningClient, - clusterMode ? pubSub! : undefined, - ); - } - - if (publishingClient) { - await clientCleanup(publishingClient); - } + await clientCleanup(listeningClient!, pubSub!); + await clientCleanup(publishingClient!); } }, TIMEOUT, @@ -3259,16 +3067,8 @@ describe("PubSub", () => { // Assert no messages left expect(callbackMessages.length).toEqual(1); } finally { - if (listeningClient) { - await clientCleanup( - listeningClient, - clusterMode ? pubSub! : undefined, - ); - } - - if (publishingClient) { - await clientCleanup(publishingClient); - } + await clientCleanup(listeningClient!, pubSub!); + await clientCleanup(publishingClient!); } }, TIMEOUT, @@ -3436,20 +3236,9 @@ describe("PubSub", () => { }); expect(nonMatchingChannels.length).toBe(0); } finally { - if (client1) { - await clientCleanup( - client1, - clusterMode ? pubSub! : undefined, - ); - } - - if (client2) { - await clientCleanup(client2); - } - - if (client) { - await clientCleanup(client); - } + await clientCleanup(client1, pubSub!); + await clientCleanup(client2); + await clientCleanup(client); } }, TIMEOUT, @@ -3519,20 +3308,9 @@ describe("PubSub", () => { const numPatterns = await client2.pubsubNumPat(); expect(numPatterns).toBe(2); } finally { - if (client1) { - await clientCleanup( - client1, - clusterMode ? pubSub! : undefined, - ); - } - - if (client2) { - await clientCleanup(client2); - } - - if (client) { - await clientCleanup(client); - } + await clientCleanup(client1, pubSub!); + await clientCleanup(client2); + await clientCleanup(client); } }, TIMEOUT, @@ -3668,34 +3446,11 @@ describe("PubSub", () => { const emptySubscribers = await client2.pubsubNumSub([]); expect(emptySubscribers).toEqual([]); } finally { - if (client1) { - await clientCleanup( - client1, - clusterMode ? pubSub1! : undefined, - ); - } - - if (client2) { - await clientCleanup( - client2, - clusterMode ? pubSub2! : undefined, - ); - } - - if (client3) { - await clientCleanup( - client3, - clusterMode ? pubSub3! : undefined, - ); - } - - if (client4) { - await clientCleanup(client4); - } - - if (client) { - await clientCleanup(client); - } + await clientCleanup(client1, pubSub1!); + await clientCleanup(client2, pubSub2!); + await clientCleanup(client3, pubSub3!); + await clientCleanup(client4); + await clientCleanup(client); } }, TIMEOUT, @@ -3782,17 +3537,9 @@ describe("PubSub", () => { ).pubsubShardChannels({ pattern: "non_matching_*" }); expect(nonMatchingChannels).toEqual([]); } finally { - if (client1) { - await clientCleanup(client1, pubSub ? pubSub : undefined); - } - - if (client2) { - await clientCleanup(client2); - } - - if (client) { - await clientCleanup(client); - } + await clientCleanup(client1, pubSub!); + await clientCleanup(client2); + await clientCleanup(client); } }, TIMEOUT, @@ -3910,25 +3657,11 @@ describe("PubSub", () => { ).pubsubShardNumSub([]); expect(emptySubscribers).toEqual([]); } finally { - if (client1) { - await clientCleanup(client1, pubSub1 ? pubSub1 : undefined); - } - - if (client2) { - await clientCleanup(client2, pubSub2 ? pubSub2 : undefined); - } - - if (client3) { - await clientCleanup(client3, pubSub3 ? pubSub3 : undefined); - } - - if (client4) { - await clientCleanup(client4); - } - - if (client) { - await clientCleanup(client); - } + await clientCleanup(client1, pubSub1!); + await clientCleanup(client2, pubSub2!); + await clientCleanup(client3, pubSub3!); + await clientCleanup(client4); + await clientCleanup(client); } }, TIMEOUT, @@ -3993,13 +3726,8 @@ describe("PubSub", () => { ).pubsubShardChannels(); expect(shardChannels).toEqual([shardChannel]); } finally { - if (client1) { - await clientCleanup(client1, pubSub ? pubSub : undefined); - } - - if (client2) { - await clientCleanup(client2); - } + await clientCleanup(client1, pubSub!); + await clientCleanup(client2); } }, TIMEOUT, @@ -4082,13 +3810,8 @@ describe("PubSub", () => { }); } } finally { - if (client1) { - await clientCleanup(client1, pubSub!); - } - - if (client2) { - await clientCleanup(client2, pubSub!); - } + await clientCleanup(client1, pubSub!); + await clientCleanup(client2, pubSub!); } }, TIMEOUT,