From 46f970cd141d67470b6613395d370394eeafc808 Mon Sep 17 00:00:00 2001
From: Salvatore Mesoraca <salvatore.mesoraca@aiven.io>
Date: Mon, 27 May 2024 10:23:47 +0200
Subject: [PATCH] Resolving more comments

---
 tests/conftest.py              | 6 +-----
 tests/test_asyncio/conftest.py | 2 +-
 tests/testdata/titles.csv      | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index fcb72ec2..abe62240 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -459,11 +459,7 @@ def wait_for_command(client, monitor, command, key=None):
     # for, something went wrong
     if key is None:
         # generate key
-        valkey_version = VALKEY_INFO["version"]
-        if Version(valkey_version) >= Version("5.0.0"):
-            id_str = str(client.client_id())
-        else:
-            id_str = f"{random.randrange(2 ** 32):08x}"
+        id_str = str(client.client_id())
         key = f"__VALKEY-PY-{id_str}__"
     client.get(key)
     while True:
diff --git a/tests/test_asyncio/conftest.py b/tests/test_asyncio/conftest.py
index 09d5b264..34e21dd9 100644
--- a/tests/test_asyncio/conftest.py
+++ b/tests/test_asyncio/conftest.py
@@ -247,7 +247,7 @@ async def wait_for_command(
     # for, something went wrong
     if key is None:
         # generate key
-        id_str = f"{random.randrange(2 ** 32):08x}"
+        id_str = str(await client.client_id())
         key = f"__VALKEY-PY-{id_str}__"
     await client.get(key)
     while True:
diff --git a/tests/testdata/titles.csv b/tests/testdata/titles.csv
index cbc2158a..6428dd2a 100644
--- a/tests/testdata/titles.csv
+++ b/tests/testdata/titles.csv
@@ -4321,7 +4321,7 @@ gustav krupp von bohlen und halbach,1
 yasmany tomás,4
 notre temps,1
 cats %,1
-intramolecular vibrational energy valkeytribution,1
+intramolecular vibrational energy redistribution,1
 graduate management admission test,49
 robin fleming,1
 daniel gadzhev,1