More test fixes

Fix checking of module versions.

Remove logger from a test, it's just noise in the output.

Fix cluster address remap test.

Author: gerzse

tests/conftest.py

@@ -261,7 +261,9 @@ def skip_ifmodversion_lt(min_version: str, module_name: str):
     for j in modules:
         if module_name == j.get("name"):
             version = j.get("ver")
-            mv = int(min_version.replace(".", ""))
+            mv = int(
+                "".join(["%02d" % int(segment) for segment in min_version.split(".")])
+            )
             check = version < mv
             return pytest.mark.skipif(check, reason="Redis module version")
 

tests/test_asyncio/test_cluster.py

@@ -58,7 +58,6 @@ class NodeProxy:
     def __init__(self, addr, redis_addr):
         self.addr = addr
         self.redis_addr = redis_addr
-        self.send_event = asyncio.Event()
         self.server = None
         self.task = None
         self.n_connections = 0
@@ -83,14 +82,20 @@ async def handle(self, reader, writer):
             await asyncio.gather(pipe1, pipe2)
         finally:
             redis_writer.close()
+            await self.redis_writer.wait_closed()
+            writer.close()
+            await writer.wait_closed()
 
     async def aclose(self):
-        self.task.cancel()
         try:
-            await self.task
+            self.task.cancel()
+            await asyncio.wait_for(self.task, timeout=1)
+            self.server.close()
+            await self.server.wait_closed()
+        except asyncio.TimeoutError:
+            pass
         except asyncio.CancelledError:
             pass
-        await self.server.wait_closed()
 
     async def pipe(
         self,

tests/test_connect.py

@@ -1,4 +1,3 @@
-import logging
 import re
 import socket
 import socketserver
@@ -11,9 +10,6 @@
 
 from .ssl_utils import get_ssl_filename
 
-_logger = logging.getLogger(__name__)
-
-
 _CLIENT_NAME = "test-suite-client"
 _CMD_SEP = b"\r\n"
 _SUCCESS_RESP = b"+OK" + _CMD_SEP
@@ -228,10 +224,10 @@ def is_serving(self):
 
 class _RedisRequestHandler(socketserver.StreamRequestHandler):
     def setup(self):
-        _logger.info("%s connected", self.client_address)
+        pass
 
     def finish(self):
-        _logger.info("%s disconnected", self.client_address)
+        pass
 
     def handle(self):
         buffer = b""
@@ -249,7 +245,6 @@ def handle(self):
             buffer = parts[-1]
             for fragment in parts[:-1]:
                 fragment = fragment.decode()
-                _logger.info("Command fragment: %s", fragment)
 
                 if fragment.startswith("*") and command is None:
                     command = [None for _ in range(int(fragment[1:]))]
@@ -269,9 +264,6 @@ def handle(self):
                     continue
 
                 command = " ".join(command)
-                _logger.info("Command %s", command)
                 resp = _SUPPORTED_CMDS.get(command, _ERROR_RESP)
-                _logger.info("Response %s", resp)
                 self.request.sendall(resp)
                 command = None
-        _logger.info("Exit handler")