Skip to content

Commit c51da7c

Browse files
committed
test: fix tests after disabling meters by default
1 parent b60ca59 commit c51da7c

5 files changed

Lines changed: 22 additions & 2 deletions

File tree

components/core/test/meters/test_meter.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def test_meter_context_stack_with_context_manager(meter: Meter, initial_context:
112112
("name_and_group_set", MeterContext("foo (stub)", "bar")),
113113
(
114114
"name_args_set",
115-
MeterContext("name_args_set(a=1, b=2) (stub)", Settings.active_group.get()),
115+
None, # Resolved at test time to avoid collection-time settings read
116116
),
117117
],
118118
ids=[
@@ -123,11 +123,16 @@ def test_meter_context_stack_with_context_manager(meter: Meter, initial_context:
123123
def test_monitor_decorator_should_set_context_and_measure(
124124
meter: Meter,
125125
method: str,
126-
expected_context: MeterContext,
126+
expected_context: MeterContext | None,
127127
initial_context: str,
128128
mock_profiler: "MagicMock",
129129
qtbot: "QtBot",
130130
):
131+
if expected_context is None:
132+
expected_context = MeterContext(
133+
"name_args_set(a=1, b=2) (stub)", Settings.active_group.get()
134+
)
135+
131136
tester = StubClass()
132137

133138
assert not meter.is_connected_to_profiler

components/core/test/meters/test_recovery_measurer.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
def recovery_measurer() -> RecoveryMeasurer:
2525
meter = RecoveryMeasurer.get()
2626
meter.reset_parameters()
27+
meter.enabled = True
2728
return meter
2829

2930

components/core/test/meters/test_thread_health_checker.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ def thread_health_checker(
3939
) -> Iterator[MainThreadHealthChecker]:
4040
"""Fixture to create and return a MainThreadChecker instance."""
4141
checker = MainThreadHealthChecker.get()
42+
checker.enabled = True
4243
checker._poll_interval_ms = 10
4344
checker._threshold_ms = 90
4445
yield checker

components/plugin/test/plugin/conftest.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import profiler_plugin
2525
import pytest
2626
import qgis_plugin_tools.tools.resources as _resources
27+
from qgis_profiler.meters.map_rendering import MapRenderingMeter
2728
from qgis_profiler.meters.recovery_measurer import RecoveryMeasurer
2829
from qgis_profiler.meters.thread_health_checker import MainThreadHealthChecker
2930
from qgis_profiler.profiler import ProfilerWrapper
@@ -84,3 +85,10 @@ def mock_thread_health_checker_meter(mocker: "MockerFixture") -> MagicMock:
8485
mock_meter = mocker.MagicMock()
8586
mocker.patch.object(MainThreadHealthChecker, "get", return_value=mock_meter)
8687
return mock_meter
88+
89+
90+
@pytest.fixture
91+
def mock_map_rendering_meter(mocker: "MockerFixture") -> MagicMock:
92+
mock_meter = mocker.MagicMock()
93+
mocker.patch.object(MapRenderingMeter, "get", return_value=mock_meter)
94+
return mock_meter

components/plugin/test/plugin/test_profiler_extension.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,14 @@ def profiler_extension(
115115
mock_settings_dialog: "MagicMock",
116116
mock_meter_recovery_measurer: "MagicMock",
117117
mock_thread_health_checker_meter: "MagicMock",
118+
mock_map_rendering_meter: "MagicMock",
118119
_modify_mock_profiler: None,
119120
stub_profiler_panel: StubProfilerPanel,
120121
) -> ProfilerExtension:
122+
# Enable all meters so they get added to the extension
123+
Settings.recovery_meter_enabled.set(True)
124+
Settings.thread_health_checker_enabled.set(True)
125+
Settings.map_rendering_meter_enabled.set(True)
121126
profiler_extension = ProfilerExtension(
122127
event_recorder=mock_event_recorder,
123128
profiler_panel=cast("QWidget", stub_profiler_panel),

0 commit comments

Comments
 (0)