Merge branch 'main' into memray-scheduler-profiles

coiled · Oct 24, 2024 · 92febfb · 92febfb
2 parents 525cfe6 + 5758097
commit 92febfb
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 10 deletions.
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -689,7 +689,10 @@ def s3_url(s3, s3_scratch, test_name_uuid):
     try:
         yield url
     finally:
-        s3.rm(url, recursive=True)
+        try:
+            s3.rm(url, recursive=True)
+        except FileNotFoundError:
+            pass
 
 
 @pytest.fixture(scope="function")
@@ -725,7 +728,10 @@ def gcs_url(gcs, gcs_scratch, test_name_uuid):
     try:
         yield url
     finally:
-        gcs.rm(url, recursive=True)
+        try:
+            gcs.rm(url, recursive=True)
+        except FileNotFoundError:
+            pass
 
 
 @pytest.fixture(scope="session")
@@ -751,7 +757,10 @@ def az_url(az, az_scratch, test_name_uuid):
     try:
         yield url
     finally:
-        az.rm(url, recursive=True)
+        try:
+            az.rm(url, recursive=True)
+        except FileNotFoundError:
+            pass
 
 
 # this code was taken from pytest docs

diff --git a/tests/geospatial/conftest.py b/tests/geospatial/conftest.py
@@ -41,6 +41,8 @@ def _(n_workers, env=None, **cluster_kwargs):
             if env:
                 cluster.send_private_envs(env=env)
             with cluster.get_client() as client:
+                # FIXME https://github.com/coiled/platform/issues/103
+                client.wait_for_workers(n_workers)
                 with memray_profile(client), benchmark_all(client):
                     yield client
 

diff --git a/tests/geospatial/test_atmospheric_circulation.py b/tests/geospatial/test_atmospheric_circulation.py
@@ -9,7 +9,6 @@ def test_atmospheric_circulation(
     cluster_kwargs={
         "workspace": "dask-benchmarks-gcp",
         "region": "us-central1",
-        "wait_for_workers": True,
     },
     scale_kwargs={
         "small": {"n_workers": 10},

diff --git a/tests/geospatial/test_climatology.py b/tests/geospatial/test_climatology.py
@@ -80,7 +80,6 @@ def test_rechunk_map_blocks(
     cluster_kwargs={
         "workspace": "dask-benchmarks-gcp",
         "region": "us-central1",
-        "wait_for_workers": True,
     },
     scale_kwargs={
         "small": {"n_workers": 10},
@@ -143,7 +142,6 @@ def test_highlevel_api(
     cluster_kwargs={
         "workspace": "dask-benchmarks-gcp",
         "region": "us-central1",
-        "wait_for_workers": True,
         "idle_timeout": "1h",
     },
     scale_kwargs={

diff --git a/tests/geospatial/test_cloud_optimize.py b/tests/geospatial/test_cloud_optimize.py
@@ -9,7 +9,6 @@ def test_cloud_optimize(
     cluster_kwargs={
         "workspace": "dask-benchmarks",
         "region": "us-west-2",
-        "wait_for_workers": True,
     },
     scale_kwargs={
         "small": {"n_workers": 10},

diff --git a/tests/geospatial/test_rechunking.py b/tests/geospatial/test_rechunking.py
@@ -9,7 +9,6 @@ def test_era5_rechunking(
     cluster_kwargs={
         "workspace": "dask-benchmarks-gcp",
         "region": "us-central1",
-        "wait_for_workers": True,
     },
     scale_kwargs={
         "small": {"n_workers": 10},

diff --git a/tests/geospatial/test_satellite_filtering.py b/tests/geospatial/test_satellite_filtering.py
@@ -61,7 +61,6 @@ def test_satellite_filtering(
     cluster_kwargs={
         "workspace": "dask-benchmarks-azure",
         "region": "westeurope",
-        "wait_for_workers": True,
     },
     scale_kwargs={
         "small": {"n_workers": 10},

diff --git a/tests/geospatial/test_zonal_average.py b/tests/geospatial/test_zonal_average.py
@@ -15,7 +15,6 @@ def test_nwm(
     cluster_kwargs={
         "workspace": "dask-benchmarks",
         "region": "us-east-1",
-        "wait_for_workers": True,
     },
     scale_kwargs={
         "small": {"n_workers": 10},