Self-review

Author: crusaderky

distributed/deploy/tests/test_local.py

@@ -979,26 +979,29 @@ async def test_scale_memory_cores():
         assert len(cluster.worker_spec) == 4
 
 
-@gen_test()
-async def test_repr():
+@pytest.mark.asyncio
+@pytest.mark.parametrize("memory_limit", ["2 GiB", None])
+async def test_repr(memory_limit, cleanup):
     async with LocalCluster(
         n_workers=2,
         processes=False,
         threads_per_worker=2,
-        memory_limit="2 GiB",
+        memory_limit=memory_limit,
         asynchronous=True,
         dashboard_address=":0",
     ) as cluster:
-        async with Client(cluster, asynchronous=True) as client:
-            await client.wait_for_workers(2)
+        # __repr__ uses cluster.scheduler_info, which slightly lags behind
+        # cluster.scheduler.workers and client.wait_for_workers.
+        while len(cluster.scheduler_info["workers"]) < 2:
+            await asyncio.sleep(0.01)
+
         text = repr(cluster)
         assert cluster.scheduler_address in text
-        assert "workers=2, threads=4, memory=4.00 GiB" in text
-
-    async with LocalCluster(
-        n_workers=2, processes=False, memory_limit=None, asynchronous=True
-    ) as cluster:
-        assert "memory" not in repr(cluster)
+        assert "workers=2, threads=4" in text
+        if memory_limit:
+            assert "memory=4.00 GiB" in text
+        else:
+            assert "memory" not in text
 
 
 @gen_test()

distributed/deploy/tests/test_spec_cluster.py

@@ -34,7 +34,7 @@ async def _():
     1: {"cls": Worker, "options": {"nthreads": 2}},
     "my-worker": {"cls": MyWorker, "options": {"nthreads": 3}},
 }
-scheduler = {"cls": Scheduler, "options": {"port": 0}}
+scheduler = {"cls": Scheduler, "options": {"port": 0, "dashboard_address": ":0"}}
 
 
 @gen_test()
@@ -89,9 +89,7 @@ def test_spec_sync(loop):
 
 
 def test_loop_started():
-    with SpecCluster(
-        worker_spec, scheduler={"cls": Scheduler, "options": {"port": 0}}
-    ) as cluster:
+    with SpecCluster(worker_spec, scheduler=scheduler):
         pass
 
 
@@ -146,7 +144,7 @@ async def test_adaptive_killed_worker():
         async with SpecCluster(
             asynchronous=True,
             worker={"cls": Nanny, "options": {"nthreads": 1}},
-            scheduler={"cls": Scheduler, "options": {"port": 0}},
+            scheduler=scheduler,
         ) as cluster:
             async with Client(cluster, asynchronous=True) as client:
                 # Scale up a cluster with 1 worker.
@@ -221,7 +219,7 @@ async def test_broken_worker():
         async with SpecCluster(
             asynchronous=True,
             workers={"good": {"cls": Worker}, "bad": {"cls": BrokenWorker}},
-            scheduler={"cls": Scheduler, "options": {"port": 0}},
+            scheduler=scheduler,
         ):
             pass
 
@@ -254,12 +252,8 @@ def new_worker_spec(self):
 
 @gen_test()
 async def test_nanny_port():
-    scheduler = {"cls": Scheduler}
     workers = {0: {"cls": Nanny, "options": {"port": 9200}}}
-
-    async with SpecCluster(
-        scheduler=scheduler, workers=workers, asynchronous=True
-    ) as cluster:
+    async with SpecCluster(scheduler=scheduler, workers=workers, asynchronous=True):
         pass