raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:openlp/openlp

Browse Source
This commit is contained in:
Tim 2019-10-18 17:59:43 +01:00
commit 1e82419f1b
No known key found for this signature in database
GPG Key ID: 3D454289AF831A6D
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab-ci.yml
View File

@ -17,7 +17,7 @@ test-debian:
before_script: before_script:
- sh scripts/generate_resources.sh - sh scripts/generate_resources.sh
script: script:
- xvfb-run -s '-screen 0 1024x768x24' pytest-3 --color=no --disable-warnings --ignore tests/functional/openlp_plugins/presentations/test_pdfcontroller.py --cov openlp --cov-report term - xvfb-run -s '-screen 0 1024x768x24' pytest-3 --color=no --disable-warnings --cov openlp --cov-report term
- mv .coverage linux.coverage - mv .coverage linux.coverage
artifacts: artifacts:
paths: paths:
@ -29,7 +29,7 @@ test-ubuntu:
before_script: before_script:
- sh scripts/generate_resources.sh - sh scripts/generate_resources.sh
script: script:
- xvfb-run -s '-screen 0 1024x768x24' pytest-3 --color=no --disable-warnings --ignore tests/functional/openlp_plugins/presentations/test_pdfcontroller.py - xvfb-run -s '-screen 0 1024x768x24' pytest-3 --color=no --disable-warnings
test-fedora: test-fedora:
stage: test stage: test
@ -37,7 +37,7 @@ test-fedora:
before_script: before_script:
- sh scripts/generate_resources.sh - sh scripts/generate_resources.sh
script: script:
- xvfb-run -s '-screen 0 1024x768x24' pytest-3 --color=no --disable-warnings --ignore tests/functional/openlp_plugins/presentations/test_pdfcontroller.py - xvfb-run -s '-screen 0 1024x768x24' pytest-3 --color=no --disable-warnings
test-arch: test-arch:
stage: test stage: test
@ -45,7 +45,7 @@ test-arch:
before_script: before_script:
- sh scripts/generate_resources.sh - sh scripts/generate_resources.sh
script: script:
- xvfb-run -s '-screen 0 1024x768x24' pytest --color=no --disable-warnings --ignore tests/functional/openlp_plugins/presentations/test_pdfcontroller.py - xvfb-run -s '-screen 0 1024x768x24' pytest --color=no --disable-warnings
test-macos: test-macos:
stage: test stage: test

4
tests/functional/openlp_plugins/presentations/test_pdfcontroller.py
View File

@ -25,7 +25,7 @@ import os
from pathlib import Path from pathlib import Path
from shutil import rmtree, which from shutil import rmtree, which
from tempfile import mkdtemp from tempfile import mkdtemp
from unittest import TestCase from unittest import TestCase, skipIf
from unittest.mock import MagicMock, patch from unittest.mock import MagicMock, patch
from PyQt5 import QtCore, QtGui from PyQt5 import QtCore, QtGui
@ -49,6 +49,7 @@ SCREEN = {
'number': 1, 'number': 1,
'size': QtCore.QRect(0, 0, 1024, 768) 'size': QtCore.QRect(0, 0, 1024, 768)
} }
IS_CI = 'GITLAB_CI' in os.environ or 'APPVEYOR' in os.environ
def get_screen_resolution(): def get_screen_resolution():
@ -114,6 +115,7 @@ class TestPdfController(TestCase, TestMixin):
# THEN: The name of the presentation controller should be correct # THEN: The name of the presentation controller should be correct
assert 'Pdf' == controller.name, 'The name of the presentation controller should be correct' assert 'Pdf' == controller.name, 'The name of the presentation controller should be correct'
@skipIf(IS_CI, "This is failing on CI, skip until we can figure out what the problem is")
def load_pdf(self, exe_path): def load_pdf(self, exe_path):
""" """
Test loading a Pdf using the PdfController Test loading a Pdf using the PdfController

4
tests/interfaces/openlp_plugins/bibles/test_lib_http.py
View File

@ -28,8 +28,10 @@ from unittest.mock import MagicMock
from openlp.core.common.registry import Registry from openlp.core.common.registry import Registry
from openlp.plugins.bibles.lib.importers.http import BGExtract, BSExtract, CWExtract from openlp.plugins.bibles.lib.importers.http import BGExtract, BSExtract, CWExtract
IS_CI = 'GITLAB_CI' in os.environ or 'APPVEYOR' in os.environ
@skipIf(os.environ.get('GITLAB_CI'), 'Skip Bible HTTP tests to prevent GitLab CI from being blacklisted')
@skipIf(IS_CI, 'Skip Bible HTTP tests to prevent GitLab CI from being blacklisted')
class TestBibleHTTP(TestCase): class TestBibleHTTP(TestCase):
def setUp(self): def setUp(self):