Merge branch 'skip-om-macos' into 'master'

Skip test that fails on macOS.

See merge request openlp/openlp!354
This commit is contained in:
Raoul Snyman 2021-09-02 20:43:42 +00:00
commit 66e8063335
1 changed files with 2 additions and 0 deletions

View File

@ -30,6 +30,7 @@ from tempfile import mkdtemp
from PyQt5 import QtCore, QtWidgets, QtGui from PyQt5 import QtCore, QtWidgets, QtGui
from openlp.core.common import is_macosx
from openlp.core.common.i18n import UiStrings from openlp.core.common.i18n import UiStrings
from openlp.core.common.registry import Registry from openlp.core.common.registry import Registry
from openlp.core.display.screens import ScreenList from openlp.core.display.screens import ScreenList
@ -206,6 +207,7 @@ def test_load_settings_position_valid(main_window, settings):
assert main_window.pos().x() == 10 assert main_window.pos().x() == 10
@pytest.mark.skipif(is_macosx(), reason='Test does not work on macOS')
def test_load_settings_position_invalid(main_window, settings): def test_load_settings_position_invalid(main_window, settings):
""" """
Test that the position of the main window is not restored when it's invalid, but rather set to (0, 0) Test that the position of the main window is not restored when it's invalid, but rather set to (0, 0)