style: remove pointless name-mangled attrs
CI / lint (push) Successful in 30s
CI / test (3.11) (push) Successful in 53s
CI / test (3.13) (push) Successful in 51s
CI / test (3.12) (push) Successful in 56s

the fact that removing them didn't break anything shows that they
were completely unneccessary - there is no inheritance tree
using the same names
This commit is contained in:
perl_d committed 2026-07-31 09:45:16 +02:00
1 parent fb0c8efebe
commit 7b79dd8ec5
28 files changed
+163 -157

No files matched your search

@@ -15,9 +15,9 @@ from aare.daq.daq import AareDAQ
def test_execute_loop_centering_rejects_invalid_sample():
daq = object.__new__(AareDAQ)
daq._AareDAQ__set_state = MagicMock()
daq._AareDAQ__devs = MagicMock()
daq._AareDAQ__aare = MagicMock()
daq._set_state = MagicMock()
daq._devs = MagicMock()
daq._aare = MagicMock()
daq._handle_operation_error = MagicMock()
daq._create_loop_centering_service = MagicMock()
@@ -29,9 +29,9 @@ def test_execute_loop_centering_rejects_invalid_sample():
def test_execute_loop_centering_handles_service_failure():
daq = object.__new__(AareDAQ)
daq._AareDAQ__set_state = MagicMock()
daq._AareDAQ__devs = types.SimpleNamespace(lamp_light=None)
daq._AareDAQ__aare = MagicMock()
daq._set_state = MagicMock()
daq._devs = types.SimpleNamespace(lamp_light=None)
daq._aare = MagicMock()
daq._handle_operation_error = MagicMock()
daq.save_screenshot_db = MagicMock()
@@ -60,9 +60,9 @@ def test_execute_loop_centering_handles_service_failure():
def test_execute_loop_centering_handles_service_success():
daq = object.__new__(AareDAQ)
daq._AareDAQ__set_state = MagicMock()
daq._AareDAQ__devs = MagicMock()
daq._AareDAQ__aare = MagicMock()
daq._set_state = MagicMock()
daq._devs = MagicMock()
daq._aare = MagicMock()
daq._handle_operation_error = MagicMock()
daq.save_screenshot_db = MagicMock()
+1 -1
View File
@@ -76,7 +76,7 @@ def geom_model():
def test_aare_wrapper_init(mock_grid, mock_proc, mock_sample, mock_tell, mock_api, mock_bl):
wrapper = AareWrapper(bl=mock_bl)
mock_api.assert_called_once()
assert wrapper._AareWrapper__bl == mock_bl
assert wrapper._bl == mock_bl
@patch("aareDB.ApiClient")
+6 -5
View File
@@ -49,7 +49,7 @@ def staff_token_data():
def test_create_access_token(token_data):
with patch("aare.daq.auth.SECRET_KEY", "test_secret"):
with patch("aare.daq.auth.jwt_key", return_value="test_secret"):
token = create_access_token(token_data)
assert isinstance(token, str)
payload = jwt.decode(token, "test_secret", algorithms=["HS256"])
@@ -62,7 +62,7 @@ def test_authenticate_user(mock_cfg):
patch("pwd.getpwnam") as mock_pwd,
patch("os.getgrouplist") as mock_groups,
patch("grp.getgrgid") as mock_grp,
patch("aare.daq.auth.SECRET_KEY", "test_secret"),
patch("aare.daq.auth.jwt_key", return_value="test_secret"),
):
mock_pwd.return_value.pw_name = "testuser"
mock_pwd.return_value.pw_gid = 1000
@@ -88,7 +88,7 @@ def test_authenticate_user(mock_cfg):
def test_parse_token():
with patch("aare.daq.auth.SECRET_KEY", "test_secret"):
with patch("aare.daq.auth.jwt_key", return_value="test_secret"):
token = jwt.encode(
{"sub": "user", "pgroups": [], "session": 1, "staff": False}, "test_secret"
)
@@ -97,8 +97,9 @@ def test_parse_token():
def test_parse_token_invalid():
with pytest.raises(AuthenticationException):
parse_token("invalid.token.here")
with patch("aare.daq.auth.jwt_key", return_value="test_secret"):
with pytest.raises(AuthenticationException):
parse_token("invalid.token.here")
def test_check_jwt_ro(mock_cfg, token_data):
@@ -31,8 +31,8 @@ class _FakeRedis:
def _make_config_with_fake_redis() -> BeamlineConfig:
cfg = BeamlineConfig.__new__(BeamlineConfig)
cfg._BeamlineConfig__bl = "testbeamline"
cfg._BeamlineConfig__client = _FakeRedis()
cfg._bl = "testbeamline"
cfg._client = _FakeRedis()
return cfg
+3 -3
View File
@@ -12,7 +12,7 @@ def test_execute_face_detection_reports_failure(monkeypatch):
calls = {"set_state": [], "handle_error": []}
monkeypatch.setattr(daq, "_AareDAQ__set_state", lambda state: calls["set_state"].append(state))
monkeypatch.setattr(daq, "_set_state", lambda state: calls["set_state"].append(state))
monkeypatch.setattr(
daq,
"_create_face_detection_service",
@@ -49,7 +49,7 @@ def test_execute_face_detection_can_skip_error_reporting(monkeypatch):
handle_error_calls = []
monkeypatch.setattr(daq, "_AareDAQ__set_state", lambda state: None)
monkeypatch.setattr(daq, "_set_state", lambda state: None)
monkeypatch.setattr(
daq,
"_create_face_detection_service",
@@ -77,7 +77,7 @@ def test_public_face_detection_uses_execute_face_detection(monkeypatch):
daq = object.__new__(AareDAQ)
cfg = types.SimpleNamespace(try_set_busy=lambda timeout=360: None, state_busy=False)
setattr(daq, "_AareDAQ__cfg", cfg)
setattr(daq, "_cfg", cfg)
setattr(
daq,
+1 -1
View File
@@ -25,7 +25,7 @@ def mlbox(mock_wrapper):
def test_init_x10sa(mock_wrapper):
ml = MlBox(MXBeamline.X10SA, wrapper=mock_wrapper)
assert ml._MlBox__beamline == MXBeamline.X10SA
assert ml._beamline == MXBeamline.X10SA
def test_predict_uses_injected_wrapper():
+28 -32
View File
@@ -29,10 +29,10 @@ def _make_sample(sample_id: int, name: str) -> SampleShortInfo:
def _make_daq(previous_sample: SampleShortInfo | None) -> AareDAQ:
daq = object.__new__(AareDAQ)
daq._AareDAQ__cfg = SimpleNamespace(current_sample=previous_sample)
daq._AareDAQ__aare = MagicMock()
daq._AareDAQ__devs = MagicMock()
daq._AareDAQ__set_state = MagicMock()
daq._cfg = SimpleNamespace(current_sample=previous_sample)
daq._aare = MagicMock()
daq._devs = MagicMock()
daq._set_state = MagicMock()
daq._handle_operation_error = MagicMock()
daq.save_screenshot_db = MagicMock()
daq.sync_current_sample_from_tell = MagicMock(return_value=previous_sample)
@@ -43,8 +43,8 @@ def _make_daq(previous_sample: SampleShortInfo | None) -> AareDAQ:
@pytest.fixture
def bare_daq():
daq = object.__new__(AareDAQ)
daq._AareDAQ__cfg = SimpleNamespace()
daq._AareDAQ__devs = SimpleNamespace()
daq._cfg = SimpleNamespace()
daq._devs = SimpleNamespace()
return daq
@@ -52,8 +52,8 @@ def test_create_mounting_service_builds_expected_context(mock_logger, bare_daq):
service = bare_daq._create_mounting_service()
assert isinstance(service.ctx, MountingContext)
assert service.ctx.deps.cfg is bare_daq._AareDAQ__cfg
assert service.ctx.deps.devs is bare_daq._AareDAQ__devs
assert service.ctx.deps.cfg is bare_daq._cfg
assert service.ctx.deps.devs is bare_daq._devs
assert service.ctx.settings.mount_position == ABR_POS_MOUNT
@@ -95,7 +95,7 @@ def test_execute_mount_and_prepare_success_uses_mounting_result_fields():
assert result is True
send_calls = daq._AareDAQ__aare.send_sample_event.call_args_list
send_calls = daq._aare.send_sample_event.call_args_list
assert send_calls[0].args[0] == previous_sample.db_id
assert send_calls[0].args[1] == SampleEventType.UNMOUNTING
assert send_calls[1].args[0] == target_sample.db_id
@@ -108,10 +108,8 @@ def test_execute_mount_and_prepare_success_uses_mounting_result_fields():
daq.save_screenshot_db.assert_called_once_with(
target_sample.db_id, f"{target_sample.db_id}_mounted"
)
assert (
daq._AareDAQ__set_state.call_args_list[0].args[0] == BeamlineStateEnum.RobotSampleExchange
)
assert daq._AareDAQ__set_state.call_args_list[-1].args[0] == BeamlineStateEnum.SampleAlignment
assert daq._set_state.call_args_list[0].args[0] == BeamlineStateEnum.RobotSampleExchange
assert daq._set_state.call_args_list[-1].args[0] == BeamlineStateEnum.SampleAlignment
def test_execute_mount_and_prepare_marks_previous_sample_unmounted_when_mount_fails_after_auto_unmount():
@@ -132,9 +130,9 @@ def test_execute_mount_and_prepare_marks_previous_sample_unmounted_when_mount_fa
result = daq._execute_mount_and_prepare(target_sample)
assert result is False
assert daq._AareDAQ__cfg.current_sample is None
assert daq._cfg.current_sample is None
send_calls = daq._AareDAQ__aare.send_sample_event.call_args_list
send_calls = daq._aare.send_sample_event.call_args_list
assert send_calls[0].args[0] == previous_sample.db_id
assert send_calls[0].args[1] == SampleEventType.UNMOUNTING
@@ -150,7 +148,7 @@ def test_execute_mount_and_prepare_marks_previous_sample_unmounted_when_mount_fa
assert daq._handle_operation_error.call_args.kwargs["sample"] == target_sample
assert daq._handle_operation_error.call_args.kwargs["event_type"] == SampleEventType.MOUNTFAILED
assert daq._AareDAQ__set_state.call_args_list[-1].args[0] == BeamlineStateEnum.SampleAlignment
assert daq._set_state.call_args_list[-1].args[0] == BeamlineStateEnum.SampleAlignment
def test_execute_mount_and_prepare_does_not_mark_previous_sample_unmounted_when_not_confirmed():
@@ -171,9 +169,9 @@ def test_execute_mount_and_prepare_does_not_mark_previous_sample_unmounted_when_
result = daq._execute_mount_and_prepare(target_sample)
assert result is False
assert daq._AareDAQ__cfg.current_sample == previous_sample
assert daq._cfg.current_sample == previous_sample
send_calls = daq._AareDAQ__aare.send_sample_event.call_args_list
send_calls = daq._aare.send_sample_event.call_args_list
assert len(send_calls) == 2
assert send_calls[0].args[0] == previous_sample.db_id
assert send_calls[0].args[1] == SampleEventType.UNMOUNTING
@@ -201,7 +199,7 @@ def test_execute_mount_and_prepare_unmount_success_uses_unmount_operation():
assert result is True
send_calls = daq._AareDAQ__aare.send_sample_event.call_args_list
send_calls = daq._aare.send_sample_event.call_args_list
assert len(send_calls) == 2
assert send_calls[0].args[0] == previous_sample.db_id
assert send_calls[0].args[1] == SampleEventType.UNMOUNTING
@@ -209,10 +207,8 @@ def test_execute_mount_and_prepare_unmount_success_uses_unmount_operation():
assert send_calls[1].args[1] == SampleEventType.UNMOUNTED
daq.save_screenshot_db.assert_not_called()
assert (
daq._AareDAQ__set_state.call_args_list[0].args[0] == BeamlineStateEnum.RobotSampleExchange
)
assert daq._AareDAQ__set_state.call_args_list[-1].args[0] == BeamlineStateEnum.SampleAlignment
assert daq._set_state.call_args_list[0].args[0] == BeamlineStateEnum.RobotSampleExchange
assert daq._set_state.call_args_list[-1].args[0] == BeamlineStateEnum.SampleAlignment
def test_raise_if_critical_jfjoch_detector_error_preserves_jfjoch_exception_family():
@@ -279,9 +275,9 @@ def test_raise_if_critical_jfjoch_detector_error_ignores_non_critical_jfjoch_err
def test_create_loop_centering_service_uses_shared_screenshot_service():
daq = object.__new__(AareDAQ)
daq._AareDAQ__cfg = SimpleNamespace()
daq._AareDAQ__devs = SimpleNamespace()
daq._AareDAQ__mlbox = SimpleNamespace(predict_all_best=MagicMock())
daq._cfg = SimpleNamespace()
daq._devs = SimpleNamespace()
daq._mlbox = SimpleNamespace(predict_all_best=MagicMock())
daq._screenshot_service = MagicMock(spec=ScreenshotService)
daq._append_smargon_trace = MagicMock()
@@ -296,12 +292,12 @@ def test_create_loop_centering_service_uses_shared_screenshot_service():
def test_create_raster_service_uses_shared_screenshot_service():
daq = object.__new__(AareDAQ)
daq._AareDAQ__cfg = SimpleNamespace()
daq._AareDAQ__devs = SimpleNamespace()
daq._AareDAQ__mlbox = SimpleNamespace()
daq._AareDAQ__jfjoch = SimpleNamespace()
daq._AareDAQ__aare = SimpleNamespace()
daq._AareDAQ__set_state = MagicMock()
daq._cfg = SimpleNamespace()
daq._devs = SimpleNamespace()
daq._mlbox = SimpleNamespace()
daq._jfjoch = SimpleNamespace()
daq._aare = SimpleNamespace()
daq._set_state = MagicMock()
daq._screenshot_service = MagicMock(spec=ScreenshotService)
type(daq).sample = property(lambda self: None)
+8 -8
View File
@@ -10,11 +10,11 @@ from aare.daq.spreadsheetupdater import get_ws_headers, on_message, set_spreadsh
@pytest.fixture
def mock_config():
with patch("aare.daq.spreadsheetupdater.config") as mock:
mock._BeamlineConfig__bl = "X10SA"
mock._BeamlineConfig__client = MagicMock()
mock._bl = "X10SA"
mock._client = MagicMock()
# Mocking private attributes access which the code uses
mock._BeamlineConfig__client = mock._BeamlineConfig__client
mock._BeamlineConfig__bl = mock._BeamlineConfig__bl
mock._client = mock._client
mock._bl = mock._bl
yield mock
@@ -34,7 +34,7 @@ def test_set_spreadsheet_in_redis(mock_config):
data = {"test": "data"}
with patch("aare.daq.spreadsheetupdater.config") as mock_cfg_internal:
mock_client = MagicMock()
mock_cfg_internal._BeamlineConfig__client = mock_client
mock_cfg_internal._client = mock_client
mock_cfg_internal.client = mock_client
set_spreadsheet_in_redis(data)
@@ -88,7 +88,7 @@ def test_on_message_success(mock_config):
with patch("aare.daq.spreadsheetupdater.PuckWithTellPosition", side_effect=mock_pucks):
on_message(None, message)
calls = mock_config._BeamlineConfig__client.set.call_args_list
calls = mock_config._client.set.call_args_list
written_keys = [call.args[0] for call in calls]
assert "X10SA:sample_spreadsheet" in written_keys
@@ -119,9 +119,9 @@ def test_on_message_empty_ref(mock_config):
on_message(None, message)
ref_key = "X10SA:reference-tools"
mock_config._BeamlineConfig__client.delete.assert_called_with(ref_key)
mock_config._client.delete.assert_called_with(ref_key)
def test_on_message_invalid_json(mock_config):
on_message(None, "invalid json")
mock_config._BeamlineConfig__client.set.assert_not_called()
mock_config._client.set.assert_not_called()
+6 -5
View File
@@ -1,5 +1,6 @@
import json
from unittest.mock import MagicMock, patch
from aare.daq import tellupdater
@@ -107,13 +108,13 @@ def test_record_tell_event_writes_history_to_redis():
tellupdater.tell_event_history.clear()
mock_config = MagicMock()
mock_config._BeamlineConfig__bl = "x10sa"
mock_config._bl = "x10sa"
with patch("aare.daq.tellupdater.config", mock_config):
tellupdater.record_tell_event("Motion Task", "dry")
mock_config._BeamlineConfig__client.set.assert_called_once()
redis_key, redis_value = mock_config._BeamlineConfig__client.set.call_args.args
mock_config._client.set.assert_called_once()
redis_key, redis_value = mock_config._client.set.call_args.args
assert redis_key == "x10sa:tell_events"
payload = json.loads(redis_value)
@@ -128,13 +129,13 @@ def test_record_tell_event_keeps_last_25_events():
tellupdater.tell_event_history.clear()
mock_config = MagicMock()
mock_config._BeamlineConfig__bl = "x10sa"
mock_config._bl = "x10sa"
with patch("aare.daq.tellupdater.config", mock_config):
for idx in range(30):
tellupdater.record_tell_event("Motion Sync", f"event-{idx}")
redis_key, redis_value = mock_config._BeamlineConfig__client.set.call_args.args
redis_key, redis_value = mock_config._client.set.call_args.args
assert redis_key == "x10sa:tell_events"
payload = json.loads(redis_value)
+5 -5
View File
@@ -26,8 +26,8 @@ def aerotech_controller(mock_aerotech_api):
):
controller = AerotechController(MXBeamline.X10SA)
controller._AerotechController__api = mock_aerotech_api
controller._AerotechController__simulated = False
controller._api = mock_aerotech_api
controller._simulated = False
return controller
@@ -36,13 +36,13 @@ def test_init_x10sa(mock_aerotech_api):
"aare.devices.aerotech.cfg_get", return_value="http://mx-x10sa-queue-01.psi.ch:5234"
):
controller = AerotechController(MXBeamline.X10SA)
assert controller._AerotechController__base == "http://mx-x10sa-queue-01.psi.ch:5234"
assert controller._AerotechController__simulated is False
assert controller._base == "http://mx-x10sa-queue-01.psi.ch:5234"
assert controller._simulated is False
def test_init_simulated():
controller = AerotechController(MXBeamline.SIMULATED)
assert controller._AerotechController__simulated is True
assert controller._simulated is True
def test_cancel(aerotech_controller, mock_aerotech_api):
+3 -3
View File
@@ -89,17 +89,17 @@ def create_mock_daq_status():
def test_init_x10sa(mock_jfjoch_client):
wrapper = JFJochWrapper(MXBeamline.X10SA)
assert wrapper._JFJochWrapper__url == "http://sls-gpu-002:8080"
assert wrapper._url == "http://sls-gpu-002:8080"
def test_init_x06da(mock_jfjoch_client):
wrapper = JFJochWrapper(MXBeamline.X06DA)
assert wrapper._JFJochWrapper__url == "http://sls-gpu-001:8080"
assert wrapper._url == "http://sls-gpu-001:8080"
def test_init_simulated(mock_jfjoch_client):
wrapper = JFJochWrapper(MXBeamline.SIMULATED)
assert wrapper._JFJochWrapper__simulated is True
assert wrapper._simulated is True
def test_init_unknown():
+8 -8
View File
@@ -30,7 +30,7 @@ def camera_thread(mock_zmq, qtbot):
def test_init(camera_thread):
assert camera_thread.running is True
assert camera_thread._SampleCameraThread__camera_available is False
assert camera_thread._camera_available is False
def test_update_daq_status(camera_thread):
@@ -38,15 +38,15 @@ def test_update_daq_status(camera_thread):
s.geom.beam_location_pxl.x = 100
s.geom.beam_location_pxl.y = 200
camera_thread.update_daq_status(s)
assert camera_thread._SampleCameraThread__beam_x == 100
assert camera_thread._SampleCameraThread__beam_y == 200
assert camera_thread._beam_x == 100
assert camera_thread._beam_y == 200
def test_enable_focus_measurement(camera_thread):
camera_thread.enable_focus_measurement(True)
assert camera_thread._SampleCameraThread__measure_focus is True
assert camera_thread._measure_focus is True
camera_thread.enable_focus_measurement(False)
assert camera_thread._SampleCameraThread__measure_focus is False
assert camera_thread._measure_focus is False
def test_run_success(camera_thread, mock_zmq, qtbot):
@@ -63,7 +63,7 @@ def test_run_success(camera_thread, mock_zmq, qtbot):
with qtbot.waitSignal(camera_thread.camera_image, timeout=5000):
camera_thread.run()
assert camera_thread._SampleCameraThread__camera_available is True
assert camera_thread._camera_available is True
def test_run_bayer_success(camera_thread, mock_zmq, qtbot):
@@ -80,7 +80,7 @@ def test_run_bayer_success(camera_thread, mock_zmq, qtbot):
with qtbot.waitSignal(camera_thread.camera_image, timeout=5000):
camera_thread.run()
assert camera_thread._SampleCameraThread__camera_available is True
assert camera_thread._camera_available is True
def test_run_zmq_timeout(camera_thread, mock_zmq, qtbot):
@@ -89,7 +89,7 @@ def test_run_zmq_timeout(camera_thread, mock_zmq, qtbot):
raise zmq.Again()
mock_zmq.recv_multipart.side_effect = side_effect
camera_thread._SampleCameraThread__fps_emit_period_s = 0.0
camera_thread._fps_emit_period_s = 0.0
with qtbot.waitSignal(camera_thread.fps_measure, timeout=5000):
try: