Fixed #1115 Doubling closing of dask cluster

seanlaw · seanlaw · commit 97da018380a2 · 2026-01-19T10:53:36.000-05:00
diff --git a/tests/test_aamp_ostinato.py b/tests/test_aamp_ostinato.py
@@ -15,7 +15,7 @@ def dask_cluster():
         dashboard_address=None,
         worker_dashboard_address=None,
     )
-    yield cluster
+    yield cluster.scheduler_address
     cluster.close()
 
 
diff --git a/tests/test_aamp_stimp.py b/tests/test_aamp_stimp.py
@@ -22,7 +22,7 @@ def dask_cluster():
         dashboard_address=None,
         worker_dashboard_address=None,
     )
-    yield cluster
+    yield cluster.scheduler_address
     cluster.close()
 
 
diff --git a/tests/test_aampdist.py b/tests/test_aampdist.py
@@ -16,7 +16,7 @@ def dask_cluster():
         dashboard_address=None,
         worker_dashboard_address=None,
     )
-    yield cluster
+    yield cluster.scheduler_address
     cluster.close()
 
 
diff --git a/tests/test_aamped.py b/tests/test_aamped.py
@@ -16,7 +16,7 @@ def dask_cluster():
         dashboard_address=None,
         worker_dashboard_address=None,
     )
-    yield cluster
+    yield cluster.scheduler_address
     cluster.close()
 
 
diff --git a/tests/test_maamped.py b/tests/test_maamped.py
@@ -16,7 +16,7 @@ def dask_cluster():
         dashboard_address=None,
         worker_dashboard_address=None,
     )
-    yield cluster
+    yield cluster.scheduler_address
     cluster.close()
 
 
diff --git a/tests/test_mpdist.py b/tests/test_mpdist.py
@@ -18,7 +18,7 @@ def dask_cluster():
         dashboard_address=None,
         worker_dashboard_address=None,
     )
-    yield cluster
+    yield cluster.scheduler_address
     cluster.close()
 
 
diff --git a/tests/test_mstumped.py b/tests/test_mstumped.py
@@ -18,7 +18,7 @@ def dask_cluster():
         dashboard_address=None,
         worker_dashboard_address=None,
     )
-    yield cluster
+    yield cluster.scheduler_address
     cluster.close()
 
 
diff --git a/tests/test_non_normalized_decorator.py b/tests/test_non_normalized_decorator.py
@@ -24,7 +24,7 @@ def dask_cluster():
         dashboard_address=None,
         worker_dashboard_address=None,
     )
-    yield cluster
+    yield cluster.scheduler_address
     cluster.close()
 
 
diff --git a/tests/test_ostinato.py b/tests/test_ostinato.py
@@ -17,7 +17,7 @@ def dask_cluster():
         dashboard_address=None,
         worker_dashboard_address=None,
     )
-    yield cluster
+    yield cluster.scheduler_address
     cluster.close()
 
 
diff --git a/tests/test_stimp.py b/tests/test_stimp.py
@@ -22,7 +22,7 @@ def dask_cluster():
         dashboard_address=None,
         worker_dashboard_address=None,
     )
-    yield cluster
+    yield cluster.scheduler_address
     cluster.close()
 
 
diff --git a/tests/test_stumped.py b/tests/test_stumped.py
@@ -19,7 +19,7 @@ def dask_cluster():
         dashboard_address=None,
         worker_dashboard_address=None,
     )
-    yield cluster
+    yield cluster.scheduler_address
     cluster.close()
 
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ def dask_cluster():`
`15`	`15`	`dashboard_address=None,`
`16`	`16`	`worker_dashboard_address=None,`
`17`	`17`	`)`
`18`		`- yield cluster`
	`18`	`+ yield cluster.scheduler_address`
`19`	`19`	`cluster.close()`
`20`	`20`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ def dask_cluster():`
`22`	`22`	`dashboard_address=None,`
`23`	`23`	`worker_dashboard_address=None,`
`24`	`24`	`)`
`25`		`- yield cluster`
	`25`	`+ yield cluster.scheduler_address`
`26`	`26`	`cluster.close()`
`27`	`27`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ def dask_cluster():`
`16`	`16`	`dashboard_address=None,`
`17`	`17`	`worker_dashboard_address=None,`
`18`	`18`	`)`
`19`		`- yield cluster`
	`19`	`+ yield cluster.scheduler_address`
`20`	`20`	`cluster.close()`
`21`	`21`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ def dask_cluster():`
`18`	`18`	`dashboard_address=None,`
`19`	`19`	`worker_dashboard_address=None,`
`20`	`20`	`)`
`21`		`- yield cluster`
	`21`	`+ yield cluster.scheduler_address`
`22`	`22`	`cluster.close()`
`23`	`23`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ def dask_cluster():`
`24`	`24`	`dashboard_address=None,`
`25`	`25`	`worker_dashboard_address=None,`
`26`	`26`	`)`
`27`		`- yield cluster`
	`27`	`+ yield cluster.scheduler_address`
`28`	`28`	`cluster.close()`
`29`	`29`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ def dask_cluster():`
`17`	`17`	`dashboard_address=None,`
`18`	`18`	`worker_dashboard_address=None,`
`19`	`19`	`)`
`20`		`- yield cluster`
	`20`	`+ yield cluster.scheduler_address`
`21`	`21`	`cluster.close()`
`22`	`22`
`23`	`23`