Simplify test

Author: kristjanvalur

tests/test_asyncio/test_commands.py

@@ -3017,18 +3017,14 @@ async def helper():
                 await r.brpop(["nonexist"])
             # if all is well, we can continue.  The following should not hang.
             await r.set("status", "down")
-            return "done"
 
         task = asyncio.create_task(helper())
         await ready.wait()
         await asyncio.sleep(0.01)
         # the task is now sleeping, lets send it an exception
         task.cancel()
-        try:
-            async with async_timeout.timeout(0.1):
-                assert await task == "done"
-        except asyncio.TimeoutError:
-            task.cancel()
+        # If all is well, the task should finish right away, otherwise fail with Timeout
+        async with async_timeout.timeout(0.1):
             await task
 
 

tests/test_commands.py

@@ -4723,18 +4723,14 @@ def test_interrupted_command(self, r: redis.Redis):
         will leave the socket with un-read response to a previous
         command.
         """
-        print("start")
-
+        
         def helper():
-            try:
+            with pytest.raises(BaseException):
                 # blocking pop
                 with patch.object(
                     socket.socket, "recv_into", side_effect=CancelledError
                 ) as mock_recv:
                     r.brpop(["nonexist"])
-            except CancelledError:
-                print("canc")
-                pass  # we got some BaseException.
             # if all is well, we can continue.
             r.set("status", "down")  # should not hang