@@ -48,7 +48,7 @@ async def scintillator_and_ap_sg(
4848 mock_beamline_parameters : GDABeamlineParameters ,
4949 beamstop : Beamstop ,
5050 ap_sg : ApertureScatterguard ,
51- ) -> tuple [Scintillator , MagicMock ]:
51+ ) -> tuple [Scintillator , ApertureScatterguard ]:
5252 async with init_devices (mock = True ):
5353 ap_sg .selected_aperture .set = AsyncMock ()
5454 ap_sg .selected_aperture .get_value = AsyncMock ()
@@ -139,11 +139,11 @@ async def test_given_scintillator_already_out_when_moved_in_or_out_then_does_not
139139 z ,
140140):
141141 scintillator , ap_sg = scintillator_and_ap_sg
142- ap_sg .get_scin_move_position .return_value = {
142+ ap_sg .get_scin_move_position .return_value = { # type: ignore
143143 ap_sg .aperture .x : - 1.0 ,
144144 ap_sg .scatterguard .x : - 1.5 ,
145145 }
146- beamstop .selected_pos .get_value .return_value = BeamstopPositions .UNKNOWN
146+ beamstop .selected_pos .get_value .return_value = BeamstopPositions .UNKNOWN # type: ignore
147147 await scintillator .y_mm .set (y )
148148 await scintillator .z_mm .set (z )
149149
@@ -173,7 +173,7 @@ async def test_beamstop_check_in_known_good_position(
173173 beamstop_position : BeamstopPositions ,
174174 expected_good : bool ,
175175):
176- beamstop .selected_pos .get_value .return_value = beamstop_position
176+ beamstop .selected_pos .get_value .return_value = beamstop_position # type: ignore
177177 scintillator , _ = scintillator_and_ap_sg
178178
179179 with (
@@ -203,7 +203,7 @@ async def test_move_scintillator_moves_ap_sg_to_scin_move_and_back(
203203 final_position : InOut ,
204204):
205205 scintillator , ap_sg = scintillator_and_ap_sg
206- ap_sg .get_scin_move_position .return_value = {
206+ ap_sg .get_scin_move_position .return_value = { # type: ignore
207207 ap_sg .aperture .x : - 1.0 ,
208208 ap_sg .scatterguard .x : - 1.5 ,
209209 }
0 commit comments