Skip to content

Commit a71d9fb

Browse files
hekaisheng刘宝
andauthored
Fix Ray cases (#2983)
Co-authored-by: 刘宝 <[email protected]>
1 parent bb7f906 commit a71d9fb

File tree

1 file changed

+34
-15
lines changed

1 file changed

+34
-15
lines changed

mars/deploy/oscar/tests/test_local.py

Lines changed: 34 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -230,13 +230,19 @@ async def test_execute(create_cluster, config):
230230

231231
del a, b
232232

233-
if not isinstance(session._isolated_session, _IsolatedWebSession):
233+
if (
234+
not isinstance(session._isolated_session, _IsolatedWebSession)
235+
and session.client
236+
):
234237
worker_pools = session.client._cluster._worker_pools
235238
await session.destroy()
236239
for worker_pool in worker_pools:
237-
_assert_storage_cleaned(
238-
session.session_id, worker_pool.external_address, StorageLevel.MEMORY
239-
)
240+
if hasattr(worker_pool, "external_address"):
241+
_assert_storage_cleaned(
242+
session.session_id,
243+
worker_pool.external_address,
244+
StorageLevel.MEMORY,
245+
)
240246

241247

242248
@pytest.mark.asyncio
@@ -262,13 +268,19 @@ async def test_iterative_tiling(create_cluster):
262268
assert df2.index_value.min_val >= 1
263269
assert df2.index_value.max_val <= 30
264270

265-
if not isinstance(session._isolated_session, _IsolatedWebSession):
271+
if (
272+
not isinstance(session._isolated_session, _IsolatedWebSession)
273+
and session.client
274+
):
266275
worker_pools = session.client._cluster._worker_pools
267276
await session.destroy()
268277
for worker_pool in worker_pools:
269-
_assert_storage_cleaned(
270-
session.session_id, worker_pool.external_address, StorageLevel.MEMORY
271-
)
278+
if hasattr(worker_pool, "external_address"):
279+
_assert_storage_cleaned(
280+
session.session_id,
281+
worker_pool.external_address,
282+
StorageLevel.MEMORY,
283+
)
272284

273285

274286
@pytest.mark.asyncio
@@ -287,13 +299,19 @@ async def test_execute_describe(create_cluster):
287299
res = await session.fetch(r)
288300
pd.testing.assert_frame_equal(res, raw.describe())
289301

290-
if not isinstance(session._isolated_session, _IsolatedWebSession):
302+
if (
303+
not isinstance(session._isolated_session, _IsolatedWebSession)
304+
and session.client
305+
):
291306
worker_pools = session.client._cluster._worker_pools
292307
await session.destroy()
293308
for worker_pool in worker_pools:
294-
_assert_storage_cleaned(
295-
session.session_id, worker_pool.external_address, StorageLevel.MEMORY
296-
)
309+
if hasattr(worker_pool, "external_address"):
310+
_assert_storage_cleaned(
311+
session.session_id,
312+
worker_pool.external_address,
313+
StorageLevel.MEMORY,
314+
)
297315

298316

299317
@pytest.mark.asyncio
@@ -421,9 +439,10 @@ async def test_web_session(create_cluster, config):
421439

422440
worker_pools = client._cluster._worker_pools
423441
for worker_pool in worker_pools:
424-
_assert_storage_cleaned(
425-
session.session_id, worker_pool.external_address, StorageLevel.MEMORY
426-
)
442+
if hasattr(worker_pool, "external_address"):
443+
_assert_storage_cleaned(
444+
session.session_id, worker_pool.external_address, StorageLevel.MEMORY
445+
)
427446

428447

429448
@pytest.mark.parametrize("config", [{"backend": "mars", "incremental_index": True}])

0 commit comments

Comments
 (0)