Revert "Refactor test"

This reverts commit 641bcdd.

Author: dandavison

tests/nexus/test_worker.py

@@ -3,7 +3,7 @@
 import asyncio
 import uuid
 from datetime import timedelta
-from typing import Any, Sequence
+from typing import Any
 
 import nexusrpc.handler
 import pytest
@@ -37,19 +37,17 @@ async def run(self, n: int) -> None:
 
 
 @pytest.mark.parametrize(
-    ["num_nexus_operations", "max_concurrent_nexus_tasks", "expect_timeout"],
+    ["num_nexus_operations", "max_concurrent_nexus_tasks"],
     [
-        (1, 1, False),
-        (1, 3, False),
-        (3, 3, False),
-        (4, 3, True),
+        (1, 1),
+        (3, 3),
+        (4, 3),
     ],
 )
 async def test_max_concurrent_nexus_tasks(
     env: WorkflowEnvironment,
     max_concurrent_nexus_tasks: int,
     num_nexus_operations: int,
-    expect_timeout: bool,
 ):
     if env.supports_time_skipping:
         pytest.skip("Nexus tests don't work with Javas test server")
@@ -59,12 +57,8 @@ def __init__(self, size: int) -> None:
             self.size = size
             self.event = asyncio.Event()
 
-        @property
-        def waiters(self) -> Sequence[Any]:
-            return getattr(self.event, "_waiters")
-
         async def wait(self) -> None:
-            if len(self.waiters) >= self.size - 1:
+            if len(self.event._waiters) >= self.size - 1:
                 self.event.set()
             else:
                 await self.event.wait()
@@ -93,7 +87,9 @@ async def op(
             id=str(uuid.uuid4()),
             task_queue=worker.task_queue,
         )
-        if expect_timeout:
+        if num_nexus_operations <= max_concurrent_nexus_tasks:
+            await execute_operations_concurrently
+        else:
             try:
                 await asyncio.wait_for(execute_operations_concurrently, timeout=10)
             except TimeoutError:
@@ -104,5 +100,3 @@ async def op(
                     f"max_concurrent_nexus_tasks={max_concurrent_nexus_tasks}, "
                     f"num_nexus_operations={num_nexus_operations}"
                 )
-        else:
-            await execute_operations_concurrently