fix node tests

valkey-io · Dec 31, 2023 · 58c1721 · 58c1721
1 parent 9d07f40
commit 58c1721
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 17 deletions.
diff --git a/node/tests/RedisClusterClient.test.ts b/node/tests/RedisClusterClient.test.ts
@@ -151,8 +151,12 @@ describe("RedisClusterClient", () => {
             const client = await RedisClusterClient.createClient(
                 getOptions(cluster.ports())
             );
-            const result = (await client.info([
+            const info_server = (await client.info([
                 InfoOptions.Server,
+            ])) as Record<string, string>;
+            expect(info_server.toString()).toEqual(expect.stringContaining("# Server"));
+
+            const result = (await client.info([
                 InfoOptions.Replication,
             ])) as Record<string, string>;
             const clusterNodes = await client.customCommand([
@@ -161,9 +165,8 @@ describe("RedisClusterClient", () => {
             ]);
             expect(
                 (clusterNodes as string)?.split("master").length - 1
-            ).toEqual(Object.keys(result).length);
+            ).toEqual(Object.keys(info_server).length);
             Object.values(result).every((item) => {
-                expect(item).toEqual(expect.stringContaining("# Server"));
                 expect(item).toEqual(expect.stringContaining("# Replication"));
                 expect(item).toEqual(
                     expect.not.stringContaining("# Errorstats")
@@ -216,7 +219,10 @@ describe("RedisClusterClient", () => {
             );
             const transaction = new ClusterTransaction();
             const expectedRes = transactionTest(transaction);
+            console.log(expectedRes);
+            console.log(transaction);
             const result = await client.exec(transaction);
+            console.log(result);
             expect(result).toEqual(expectedRes);
             client.close();
         },

diff --git a/node/tests/SharedTests.ts b/node/tests/SharedTests.ts
@@ -983,12 +983,20 @@ export function runBaseTests<Context>(config: {
                 expect(await client.ttl(key)).toBeLessThanOrEqual(10);
                 /// set command clears the timeout.
                 expect(await client.set(key, "bar")).toEqual("OK");
-                expect(
-                    await client.pexpire(key, 10000, ExpireOptions.HasNoExpiry)
-                ).toEqual(true);
+                const version = await getVersion();
+                if (version[0] < 7 ) {
+                    expect(
+                        await client.pexpire(key, 10000)
+                    ).toEqual(true);
+                 }
+                else {
+                    expect(
+                        await client.pexpire(key, 10000, ExpireOptions.HasNoExpiry)
+                    ).toEqual(true);
+                }
+
                 expect(await client.ttl(key)).toBeLessThanOrEqual(10);
                 /// TTL will be updated to the new value = 15
-                const version = await getVersion();
                 if (version[0] < 7 ) {
                     expect(
                         await client.expire(
@@ -1026,24 +1034,45 @@ export function runBaseTests<Context>(config: {
                     )
                 ).toEqual(true);
                 expect(await client.ttl(key)).toBeLessThanOrEqual(10);
-                expect(
-                    await client.expireAt(
-                        key,
-                        Math.floor(Date.now() / 1000) + 50,
-                        ExpireOptions.NewExpiryGreaterThanCurrent
-                    )
-                ).toEqual(true);
+                const version = await getVersion();
+                if (version[0] < 7 ) {
+                    expect(
+                        await client.expireAt(
+                            key,
+                            Math.floor(Date.now() / 1000) + 50
+                        )
+                    ).toEqual(true);
+                }
+                else{
+                    expect(
+                        await client.expireAt(
+                            key,
+                            Math.floor(Date.now() / 1000) + 50,
+                            ExpireOptions.NewExpiryGreaterThanCurrent
+                        )
+                    ).toEqual(true);
+                }
                 expect(await client.ttl(key)).toBeLessThanOrEqual(50);
 
                 /// set command clears the timeout.
                 expect(await client.set(key, "bar")).toEqual("OK");
+                if (version[0] < 7 ) {
                 expect(
                     await client.pexpireAt(
                         key,
-                        Date.now() + 50000,
-                        ExpireOptions.HasExistingExpiry
+                        Date.now() + 50000
                     )
                 ).toEqual(false);
+                    }
+                else{
+                    expect(
+                        await client.pexpireAt(
+                            key,
+                            Date.now() + 50000,
+                            ExpireOptions.HasExistingExpiry
+                        )
+                    ).toEqual(false);
+                }
             });
         },
         config.timeout

diff --git a/python/python/tests/test_async_client.py b/python/python/tests/test_async_client.py
@@ -355,7 +355,6 @@ async def test_request_error_raises_exception(self, redis_client: TRedisClient):
     @pytest.mark.parametrize("cluster_mode", [True, False])
     async def test_info_server_replication(self, redis_client: TRedisClient):
         info = get_first_result(await redis_client.info([InfoSection.SERVER]))
-        print(info)
         assert "# Server" in info
         cluster_mode = parse_info_response(info)["redis_mode"]
         expected_cluster_mode = isinstance(redis_client, RedisClusterClient)