style: remove pointless name-mangled attrs
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:
1 parent
fb0c8efebe
commit
7b79dd8ec5
28 files changed
+163
-157
No files matched your search
@@ -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:
|
||||
|
||||
Reference in new issue
Block a user