Skip to content

chore: Move cli tests into correct directory #1406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abbiemery merged 2 commits into from
Feb 26, 2026
Merged

chore: Move cli tests into correct directory #1406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b327ec
Move cli tests into correct directory
abbiemery Feb 19, 2026
683e8b9
Remote trace reloading fixture
tpoliaw Feb 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
14 changes: 0 additions & 14 deletions tests/unit_tests/test_cli.py → tests/unit_tests/cli/test_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import importlib
import json
import os
import uuid
Expand All @@ -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
Expand Down Expand Up @@ -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)
Expand Down