mirror of
https://gitlab.com/openlp/openlp.git
synced 2024-12-25 11:14:07 +00:00
Merge branch 'slidecontroller-screenshot-test-fix' into 'master'
Fixing freezing screenshot test See merge request openlp/openlp!625
This commit is contained in:
commit
3d21a6acf5
@ -1447,6 +1447,8 @@ def _init__capture_maindisplay_mocks(geometry, mocked_screenlist, mocked_applica
|
|||||||
display_mock = MagicMock(grab_screenshot_safe=MagicMock(return_value=windowed_screenshot_mock), is_display=True)
|
display_mock = MagicMock(grab_screenshot_safe=MagicMock(return_value=windowed_screenshot_mock), is_display=True)
|
||||||
slide_controller.displays = [display_mock]
|
slide_controller.displays = [display_mock]
|
||||||
slide_controller.service_item = ServiceItem(None)
|
slide_controller.service_item = ServiceItem(None)
|
||||||
|
# Bypassing signal call to avoid test freeze
|
||||||
|
slide_controller._capture_maindisplay_desktop_mainthread_safe = slide_controller._capture_maindisplay_desktop_signal
|
||||||
mocked_geometry = MagicMock(
|
mocked_geometry = MagicMock(
|
||||||
x=MagicMock(return_value=geometry[1][0]),
|
x=MagicMock(return_value=geometry[1][0]),
|
||||||
y=MagicMock(return_value=geometry[1][1]),
|
y=MagicMock(return_value=geometry[1][1]),
|
||||||
|
Loading…
Reference in New Issue
Block a user