openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge branch 'fix-tests-on-macos' into 'master' 

Fix a couple of macOS issues

See merge request openlp/openlp!652
This commit is contained in:
Tomas Groth 2023-08-19 09:43:21 +00:00
parent 25c79528b0 dccf037bd6
commit a8d21de601
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/app.py
View File

@ -463,7 +463,7 @@ def main():
if is_win():
os.environ['PYTHON_VLC_LIB_PATH'] = str(vlc_dir / 'libvlc.dll')
elif is_macosx():
os.environ['PYTHON_VLC_LIB_PATH'] = str(vlc_dir / 'libvlc.5.dylib')
os.environ['PYTHON_VLC_LIB_PATH'] = str(vlc_dir / 'libvlc.dylib')
os.environ['PYTHON_VLC_MODULE_PATH'] = str(vlc_dir)
os.environ['PATH'] += ';' + str(vlc_dir)
log.debug('VLC Path: {}'.format(os.environ.get('PYTHON_VLC_LIB_PATH', '')))

2
tests/openlp_plugins/bibles/test_lib_http.py
View File

@ -29,7 +29,7 @@ import pytest
from openlp.plugins.bibles.lib.importers.http import BGExtract, BSExtract, CWExtract
if 'GITLAB_CI' in os.environ or 'APPVEYOR' in os.environ:
if not os.environ.get('OPENLP_RUN_HTTP_BIBLE_TESTS'):
pytest.skip('Skip Bible HTTP tests to prevent GitLab CI from being blacklisted', allow_module_level=True)

3
tests/openlp_plugins/presentations/test_maclocontroller.py
View File

@ -358,7 +358,8 @@ def test_stop_presentation(controller: MacLOController, document: MacLODocument)
@patch('openlp.plugins.presentations.lib.maclocontroller.ScreenList')
@patch('openlp.plugins.presentations.lib.maclocontroller.Registry')
def test_start_presentation(MockedRegistry: MagicMock, MockedScreenList: MagicMock):
def test_start_presentation(MockedRegistry: MagicMock, MockedScreenList: MagicMock, controller: MacLOController,
document: MacLODocument):
"""
Test the start_presentation() method
"""