chore: Move cli tests into correct directory (#1406)

The cli tests were in the root unit test dir, when the cli now has its
own module. This makes it match the src layout.

The `reload_opentelemetry_trace_after_tests` fixture has been removed as it wasn't working as intended and didn't appear to be needed anymore. If there are issues in the future we will re-address. 

---------

Co-authored-by: Peter Holloway <peter.holloway@diamond.ac.uk>

Author: abbiemery

tests/conftest.py

@@ -44,7 +44,7 @@ def clean_event_loop():
     return run_engine
 
 
-@pytest.fixture(scope="session")
+@pytest.fixture(scope="session", autouse=True)
 def exporter() -> JsonObjectSpanExporter:
     setup_tracing("test", False)
     exporter = JsonObjectSpanExporter()

tests/unit_tests/test_cli.py tests/unit_tests/cli/test_cli.pytests/unit_tests/test_cli.py renamed to tests/unit_tests/cli/test_cli.py

@@ -1,4 +1,3 @@
-import importlib
 import json
 import os
 import uuid
@@ -18,7 +17,6 @@
 from bluesky_stomp.messaging import StompClient
 from bluesky_stomp.models import MessageTopic
 from click.testing import CliRunner
-from opentelemetry import trace
 from ophyd_async.core import AsyncStatus
 from pydantic import BaseModel
 from requests.exceptions import ConnectionError
@@ -63,18 +61,6 @@
 )
 
 
-@pytest.fixture(autouse=True)
-def reload_opentelemetry_trace_after_tests():
-    """Reload opentelemetry.trace after running each test.
-
-    OpenTelemetry only allows one global TracerProvider, however most cli entry-points
-    overwrite this to set up tracing. As OpenTelemetry does not have any functions to
-    aid testing, the library init has to be reloaded after each test to avoid errors.
-    """
-    yield
-    importlib.reload(trace)
-
-
 @pytest.fixture
 def mock_connection() -> Mock:
     return Mock(spec=Connection)