Remove unrelated CI fixes from PR 9272

Author: peter941221

distributed/dashboard/tests/test_scheduler_bokeh.py

@@ -1180,7 +1180,6 @@ async def test_lots_of_tasks(c, s, a, b):
         "distributed.scheduler.dashboard.tls.cert": get_cert("tls-cert.pem"),
         "distributed.scheduler.dashboard.tls.ca-file": get_cert("tls-ca-cert.pem"),
     },
-    timeout=60,
 )
 async def test_https_support(c, s, a, b):
     port = s.http_server.port

distributed/diagnostics/progressbar.py

@@ -337,9 +337,8 @@ def __init__(
         **kwargs,
     ):
         super().__init__(keys, scheduler, **kwargs)
-        from ipywidgets import HTML, VBox
+        from ipywidgets import VBox
 
-        self.elapsed_time = HTML("")
         self.widget = VBox([])
 
     def make_widget(self, all):

distributed/diagnostics/tests/test_progress_widgets.py

@@ -91,13 +91,6 @@ def test_values(client):
     client.sync(p.listen)
     assert p.status == "error"
 
-
-def test_multi_progressbar_widget_empty_keys_does_not_error():
-    p = MultiProgressWidget([], scheduler="tcp://127.0.0.1:1")
-    p._draw_stop(remaining={}, status="finished")
-    assert "Finished" in p.elapsed_time.value
-
-
 def test_progressbar_done(client):
     L = [client.submit(inc, i) for i in range(5)]
     wait(L)

distributed/shuffle/tests/test_shuffle.py

@@ -19,6 +19,7 @@
 from tornado.ioloop import IOLoop
 
 import dask
+from dask.dataframe._compat import PANDAS_GE_300
 from dask.utils import key_split
 
 from distributed.comm.core import Comm
@@ -2424,6 +2425,7 @@ async def test_handle_null_partitions(c, s, a, b):
     await assert_scheduler_cleanup(s)
 
 
+@pytest.mark.xfail(PANDAS_GE_300, reason="dask/distributed#9184", strict=True)
 @gen_cluster(client=True)
 async def test_handle_null_partitions_2(c, s, a, b):
     def make_partition(i):

distributed/tests/test_batched.py

@@ -172,7 +172,7 @@ async def send():
 
         async def recv():
             while True:
-                result = await wait_for(comm.read(), 5)
+                result = await wait_for(comm.read(), 1)
                 L.extend(result)
                 if result[-1] == 9999:
                     break

distributed/tests/test_nanny.py

@@ -635,8 +635,7 @@ async def test_failure_during_worker_initialization(s):
     with captured_logger(logger="distributed.nanny", level=logging.WARNING) as logs:
         with pytest.raises(RuntimeError):
             await Nanny(s.address, foo="bar")
-    assert "Failed to start process" in logs.getvalue()
-    assert "unexpected keyword argument 'foo'" in logs.getvalue()
+    assert "Restarting worker" not in logs.getvalue()
 
 
 @gen_cluster(client=True, Worker=Nanny)

distributed/tests/test_scheduler.py

@@ -3642,7 +3642,6 @@ def print_memory_info(msg: str) -> None:
     # as fast as on Linux. Note that this behaviour is heavily impacted by OS tweaks,
     # meaning that what you observe on your local host may behave differently on CI.
     if not LINUX:
-        await asyncio.gather(*(n.close() for n in nannies))
         return
 
     print_memory_info("Before clearing memory leak")
@@ -4030,7 +4029,6 @@ async def test_gather_on_worker_bad_sender(c, s, a, b):
 async def test_gather_on_worker_bad_sender_replicated(c, s, a, b, missing_first):
     """One of the senders for a key is missing, but the key is available somewhere else"""
     x = await c.scatter("x", workers=[a.address])
-    await async_poll_for(lambda: x.key in a.data)
     bad_addr = "tcp://127.0.0.1:12345"
     # Order matters; test both
     addrs = [bad_addr, a.address] if missing_first else [a.address, bad_addr]

distributed/tests/test_stress.py

@@ -328,15 +328,12 @@ async def test_chaos_rechunk(c, s, *workers):
     y = x.rechunk((10000, 20)).rechunk((20, 10000)).sum()
     z = c.compute(y)
 
-    try:
-        start = time()
-        while time() < start + 10:
-            if z.status == "error":
-                await z
-            if z.status == "finished":
-                return
-            await asyncio.sleep(0.1)
-
-        await z.cancel()
-    finally:
-        await asyncio.gather(*(w.close() for w in workers))
+    start = time()
+    while time() < start + 10:
+        if z.status == "error":
+            await z
+        if z.status == "finished":
+            return
+        await asyncio.sleep(0.1)
+
+    await z.cancel()

distributed/tests/test_worker.py

@@ -3017,8 +3017,6 @@ async def test_log_remove_worker(c, s, a, b):
             if "stimulus_id" in ev:  # Strip timestamp
                 ev["stimulus_id"] = ev["stimulus_id"].rsplit("-", 1)[0]
 
-    worker_get_client_events = events.pop("worker-get-client")
-
     assert events == {
         a.address: [
             {
@@ -3093,14 +3091,9 @@ async def test_log_remove_worker(c, s, a, b):
                 "worker": b.address,
             },
         ],
+        "worker-get-client": [{"client": c.id, "timeout": 5, "worker": b.address}],
     }
 
-    assert {
-        "client": c.id,
-        "timeout": 5,
-        "worker": b.address,
-    } in worker_get_client_events
-
 
 @gen_cluster(client=True)
 async def test_task_flight_compute_oserror(c, s, a, b):