fix resource contention issues in web tests

Author: yaugenst-flex

tests/test_web/test_webapi_mode.py

@@ -41,6 +41,13 @@
 f, AX = plt.subplots()
 
 
+@pytest.fixture
+def unique_project_name(tmp_path):
+    """Generate unique project name using tmp_path's unique directory."""
+    # tmp_path.name gives us something like 'test_upload0'
+    return f"default_{tmp_path.name}"
+
+
 def make_mode_sim():
     """Simple mode solver"""
 
@@ -73,13 +80,13 @@ def set_api_key(monkeypatch):
 
 
 @pytest.fixture
-def mock_upload(monkeypatch, set_api_key):
+def mock_upload(monkeypatch, set_api_key, unique_project_name):
     """Mocks webapi.upload."""
     responses.add(
         responses.GET,
         f"{Env.current.web_api_endpoint}/tidy3d/project",
-        match=[matchers.query_param_matcher({"projectName": PROJECT_NAME})],
-        json={"data": {"projectId": FOLDER_ID, "projectName": PROJECT_NAME}},
+        match=[matchers.query_param_matcher({"projectName": unique_project_name})],
+        json={"data": {"projectId": FOLDER_ID, "projectName": unique_project_name}},
         status=200,
     )
 
@@ -274,21 +281,21 @@ def mock_webapi(
 
 
 @responses.activate
-def test_upload(monkeypatch, mock_upload, mock_get_info, mock_metadata):
+def test_upload(monkeypatch, mock_upload, mock_get_info, mock_metadata, unique_project_name):
     sim = make_mode_sim()
     assert sim != get_reduced_simulation(sim, reduce_simulation=True)
-    assert upload(sim, TASK_NAME, PROJECT_NAME, reduce_simulation=True)
+    assert upload(sim, TASK_NAME, unique_project_name, reduce_simulation=True)
 
 
 @pytest.mark.parametrize("reduce_simulation", [True, False])
 @responses.activate
 def test_upload_with_reduction_parameter(
-    monkeypatch, mock_upload, mock_get_info, mock_metadata, reduce_simulation
+    monkeypatch, mock_upload, mock_get_info, mock_metadata, reduce_simulation, unique_project_name
 ):
     """Test that simulation reduction is properly applied before upload based on reduce_simulation parameter."""
     sim = make_mode_sim()
 
-    upload(sim, TASK_NAME, PROJECT_NAME, reduce_simulation=reduce_simulation)
+    upload(sim, TASK_NAME, unique_project_name, reduce_simulation=reduce_simulation)
 
     if reduce_simulation:
         expected_sim = get_reduced_simulation(sim, reduce_simulation=True)
@@ -346,13 +353,13 @@ def mock_download(*args, **kwargs):
 
 
 @responses.activate
-def test_run(mock_webapi, monkeypatch, tmp_path):
+def test_run(mock_webapi, monkeypatch, tmp_path, unique_project_name):
     sim = make_mode_sim()
     monkeypatch.setattr(f"{api_path}.load", lambda *args, **kwargs: True)
     assert run(
         sim,
         task_name=TASK_NAME,
-        folder_name=PROJECT_NAME,
+        folder_name=unique_project_name,
         path=str(tmp_path / "web_test_tmp.json"),
     )
 
@@ -380,10 +387,10 @@ def test_abort_task(set_api_key, mock_get_info):
 
 
 @responses.activate
-def test_job(mock_webapi, monkeypatch, tmp_path):
+def test_job(mock_webapi, monkeypatch, tmp_path, unique_project_name):
     monkeypatch.setattr("tidy3d.web.api.container.Job.load", lambda *args, **kwargs: True)
     sim = make_mode_sim()
-    j = Job(simulation=sim, task_name=TASK_NAME, folder_name=PROJECT_NAME)
+    j = Job(simulation=sim, task_name=TASK_NAME, folder_name=unique_project_name)
 
     _ = j.run(path=str(tmp_path / "web_test_tmp.json"))
     _ = j.status
@@ -400,13 +407,13 @@ def mock_job_status(monkeypatch):
 
 
 @responses.activate
-def test_batch(mock_webapi, mock_job_status, tmp_path, monkeypatch):
+def test_batch(mock_webapi, mock_job_status, tmp_path, monkeypatch, unique_project_name):
     # monkeypatch.setattr("tidy3d.web.api.container.Batch.monitor", lambda self: time.sleep(0.1))
     # monkeypatch.setattr("tidy3d.web.api.container.Job.status", property(lambda self: "success"))
     monkeypatch.setattr(f"{api_path}.load", lambda *args, **kwargs: True)
 
     sims = {TASK_NAME: make_mode_sim()}
-    b = Batch(simulations=sims, folder_name=PROJECT_NAME)
+    b = Batch(simulations=sims, folder_name=unique_project_name)
     b.estimate_cost()
     _ = b.run(path_dir=str(tmp_path))
     assert b.real_cost() == FLEX_UNIT * len(sims)
@@ -416,16 +423,16 @@ def test_batch(mock_webapi, mock_job_status, tmp_path, monkeypatch):
 
 
 @responses.activate
-def test_async(mock_webapi, mock_job_status, monkeypatch):
+def test_async(mock_webapi, mock_job_status, monkeypatch, unique_project_name):
     # monkeypatch.setattr("tidy3d.web.api.container.Job.status", property(lambda self: "success"))
     monkeypatch.setattr(f"{api_path}.load", lambda *args, **kwargs: True)
 
     sims = {TASK_NAME: make_mode_sim()}
-    _ = run_async(sims, folder_name=PROJECT_NAME)
+    _ = run_async(sims, folder_name=unique_project_name)
 
 
 @responses.activate
-def test_patch_data(mock_webapi, monkeypatch, tmp_path):
+def test_patch_data(mock_webapi, monkeypatch, tmp_path, unique_project_name):
     """Test that mode solver is patched with remote data after run"""
 
     def get_sim_and_data():
@@ -454,7 +461,7 @@ def check_patched(result, sim, data_local, data_remote):
     result = run(
         sim,
         task_name=TASK_NAME,
-        folder_name=PROJECT_NAME,
+        folder_name=unique_project_name,
         path=str(tmp_path / "web_test_tmp.json"),
     )
 
@@ -464,7 +471,7 @@ def check_patched(result, sim, data_local, data_remote):
 
     sim, data_local, data_remote = get_sim_and_data()
 
-    j = Job(simulation=sim, task_name=TASK_NAME, folder_name=PROJECT_NAME)
+    j = Job(simulation=sim, task_name=TASK_NAME, folder_name=unique_project_name)
 
     result = j.run(path=str(tmp_path / "web_test_tmp.json"))
 
@@ -475,7 +482,7 @@ def check_patched(result, sim, data_local, data_remote):
     sim, data_local, data_remote = get_sim_and_data()
 
     sims = {TASK_NAME: sim}
-    b = Batch(simulations=sims, folder_name=PROJECT_NAME)
+    b = Batch(simulations=sims, folder_name=unique_project_name)
     result = b.run(path_dir=str(tmp_path))
 
     check_patched(result[TASK_NAME], sim, data_local, data_remote)

tests/test_web/test_webapi_mode_sim.py

@@ -59,6 +59,13 @@ def make_mode_sim():
     return td.ModeSimulation.from_mode_solver(ms)
 
 
+@pytest.fixture
+def unique_project_name(tmp_path):
+    """Generate unique project name using tmp_path's unique directory."""
+    # tmp_path.name gives us something like 'test_upload0'
+    return f"default_{tmp_path.name}"
+
+
 @pytest.fixture
 def set_api_key(monkeypatch):
     """Set the api key."""
@@ -69,13 +76,13 @@ def set_api_key(monkeypatch):
 
 
 @pytest.fixture
-def mock_upload(monkeypatch, set_api_key):
+def mock_upload(monkeypatch, set_api_key, unique_project_name):
     """Mocks webapi.upload."""
     responses.add(
         responses.GET,
         f"{Env.current.web_api_endpoint}/tidy3d/project",
-        match=[matchers.query_param_matcher({"projectName": PROJECT_NAME})],
-        json={"data": {"projectId": FOLDER_ID, "projectName": PROJECT_NAME}},
+        match=[matchers.query_param_matcher({"projectName": unique_project_name})],
+        json={"data": {"projectId": FOLDER_ID, "projectName": unique_project_name}},
         status=200,
     )
 
@@ -270,21 +277,21 @@ def mock_webapi(
 
 
 @responses.activate
-def test_upload(monkeypatch, mock_upload, mock_get_info, mock_metadata):
+def test_upload(monkeypatch, mock_upload, mock_get_info, mock_metadata, unique_project_name):
     sim = make_mode_sim()
     assert sim != get_reduced_simulation(sim, reduce_simulation=True)
-    assert upload(sim, TASK_NAME, PROJECT_NAME, reduce_simulation=True)
+    assert upload(sim, TASK_NAME, unique_project_name, reduce_simulation=True)
 
 
 @pytest.mark.parametrize("reduce_simulation", [True, False])
 @responses.activate
 def test_upload_with_reduction_parameter(
-    monkeypatch, mock_upload, mock_get_info, mock_metadata, reduce_simulation
+    monkeypatch, mock_upload, mock_get_info, mock_metadata, reduce_simulation, unique_project_name
 ):
     """Test that simulation reduction is properly applied before upload based on reduce_simulation parameter."""
     sim = make_mode_sim()
 
-    upload(sim, TASK_NAME, PROJECT_NAME, reduce_simulation=reduce_simulation)
+    upload(sim, TASK_NAME, unique_project_name, reduce_simulation=reduce_simulation)
 
     if reduce_simulation:
         expected_sim = get_reduced_simulation(sim, reduce_simulation=True)
@@ -341,13 +348,13 @@ def mock_download(*args, **kwargs):
 
 
 @responses.activate
-def test_run(mock_webapi, monkeypatch, tmp_path):
+def test_run(mock_webapi, monkeypatch, tmp_path, unique_project_name):
     sim = make_mode_sim()
     monkeypatch.setattr(f"{api_path}.load", lambda *args, **kwargs: True)
     assert run(
         sim,
         task_name=TASK_NAME,
-        folder_name=PROJECT_NAME,
+        folder_name=unique_project_name,
         path=str(tmp_path / "web_test_tmp.json"),
     )
 
@@ -375,10 +382,10 @@ def test_abort_task(set_api_key, mock_get_info):
 
 
 @responses.activate
-def test_job(mock_webapi, monkeypatch, tmp_path):
+def test_job(mock_webapi, monkeypatch, tmp_path, unique_project_name):
     monkeypatch.setattr("tidy3d.web.api.container.Job.load", lambda *args, **kwargs: True)
     sim = make_mode_sim()
-    j = Job(simulation=sim, task_name=TASK_NAME, folder_name=PROJECT_NAME)
+    j = Job(simulation=sim, task_name=TASK_NAME, folder_name=unique_project_name)
 
     _ = j.run(path=str(tmp_path / "web_test_tmp.json"))
     _ = j.status
@@ -395,12 +402,12 @@ def mock_job_status(monkeypatch):
 
 
 @responses.activate
-def test_batch(mock_webapi, mock_job_status, tmp_path):
+def test_batch(mock_webapi, mock_job_status, tmp_path, unique_project_name):
     # monkeypatch.setattr("tidy3d.web.api.container.Batch.monitor", lambda self: time.sleep(0.1))
     # monkeypatch.setattr("tidy3d.web.api.container.Job.status", property(lambda self: "success"))
 
     sims = {TASK_NAME: make_mode_sim()}
-    b = Batch(simulations=sims, folder_name=PROJECT_NAME)
+    b = Batch(simulations=sims, folder_name=unique_project_name)
     b.estimate_cost()
     _ = b.run(path_dir=str(tmp_path))
     assert b.real_cost() == FLEX_UNIT * len(sims)
@@ -410,7 +417,7 @@ def test_batch(mock_webapi, mock_job_status, tmp_path):
 
 
 @responses.activate
-def test_async(mock_webapi, mock_job_status):
+def test_async(mock_webapi, mock_job_status, unique_project_name):
     # monkeypatch.setattr("tidy3d.web.api.container.Job.status", property(lambda self: "success"))
     sims = {TASK_NAME: make_mode_sim()}
-    _ = run_async(sims, folder_name=PROJECT_NAME)
+    _ = run_async(sims, folder_name=unique_project_name)