cluster test for cwe_404 is currently bogus.

Author: kristjanvalur

tests/test_asyncio/test_cwe_404.py

@@ -44,10 +44,10 @@ def __init__(self, addr, redis_addr, delay: float):
         self.redis_streams = None
 
     async def start(self):
-        # establish connection to redis
+        # test that we can connect to redis
         with async_timeout(2):
-            self.redis_streams = await asyncio.open_connection(*self.redis_addr)
-        # start local server
+            redis_reader, redis_writer = await asyncio.open_connection(*self.redis_addr)
+        redis_writer.close()
         self.server = await asyncio.start_server(self.handle, *self.addr)
         self.ROUTINE = asyncio.create_task(self.server.serve_forever())
 
@@ -65,7 +65,8 @@ def override(self, delay: float = 0.0):
             self.delay = old
 
     async def handle(self, reader, writer):
-        redis_reader, redis_writer = self.redis_streams
+        # establish connection to redis
+        redis_reader, redis_writer = await asyncio.open_connection(*self.redis_addr)
         pipe1 = asyncio.create_task(
             pipe(reader, redis_writer, self, "to redis:", self.send_event)
         )
@@ -167,6 +168,11 @@ async def test_standalone_pipeline(delay, redis_addr):
 @pytest.mark.onlycluster
 async def test_cluster(request, redis_addr):
 
+    # TODO:  This test actually doesn't work.  Once the RedisCluster initializes,
+    # it will re-connect to the nodes as advertised by the cluster, bypassing
+    # the single DelayProxy we set up.
+    # to work around this, we really would nedd a port-remapper for the RedisCluster
+
     redis_addr = redis_addr[0], 6372  # use the cluster port
     dp = DelayProxy(addr=("127.0.0.1", 5381), redis_addr=redis_addr, delay=0.1)
     await dp.start()
@@ -179,11 +185,13 @@ async def test_cluster(request, redis_addr):
 
     dp.send_event.clear()
     t = asyncio.create_task(r.get("foo"))
-    await dp.send_event.wait()
+    # await dp.send_event.wait()  # won"t work, because DelayProxy is by-passed
     await asyncio.sleep(0.05)
     t.cancel()
-    with pytest.raises(asyncio.CancelledError):
+    try:
         await t
+    except asyncio.CancelledError:
+        pass
 
     with dp.override():
         assert await r.get("bar") == b"bar"