fix(tests): remove obsolete dodal data_session fixture

pyproject.toml

@@ -44,13 +44,13 @@ readme = "README.md"
 requires-python = ">=3.11"
 
 [project.optional-dependencies]
-demo = ["dls-dodal>=1.69.0", "ophyd-async[sim]"]
+demo = ["dls-dodal>=3.0.2", "ophyd-async[sim]"]
 
 [dependency-groups]
 dev = [
     "ophyd_async[sim]",
     "copier",
-    "dls-dodal>=1.69.0",
+    "dls-dodal>=3.0.2",
     "myst-parser",
     "prek",
     "pydata-sphinx-theme>=0.15.4",

tests/unit_tests/worker/test_task_worker.py

@@ -3,7 +3,6 @@
 import threading
 from collections.abc import Callable, Iterable
 from concurrent.futures import Future
-from pathlib import Path
 from queue import Full
 from typing import Any, TypeVar
 from unittest.mock import ANY, MagicMock, Mock, patch
@@ -13,7 +12,6 @@
 from bluesky.protocols import Movable, Readable, Status
 from bluesky.utils import MsgGenerator
 from dodal.common import inject
-from dodal.common.types import UpdatingPathProvider
 from observability_utils.tracing import (
     JsonObjectSpanExporter,
     asserting_span_exporter,
@@ -460,18 +458,7 @@ def begin_task_and_wait_until_complete(
 #
 
 
-@pytest.fixture
-def path_provider(tmp_path: Path):
-    # Prevents issue with leftover state from beamline tests
-    with patch("dodal.plan_stubs.data_session.get_path_provider") as mock:
-        mock.return_value = MagicMock(spec=UpdatingPathProvider, return_value=tmp_path)
-        mock.return_value.data_session.return_value = "foo"
-        yield
-
-
-def test_worker_and_data_events_produce_in_order(
-    worker: TaskWorker, path_provider
-) -> None:
+def test_worker_and_data_events_produce_in_order(worker: TaskWorker) -> None:
     assert_running_count_plan_produces_ordered_worker_and_data_events(
         [
             WorkerEvent(