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

.gitlab-ci.yml

@@ -17,7 +17,7 @@ test-debian:
   before_script:
     - sh scripts/generate_resources.sh
   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
   artifacts:
     paths:
@@ -29,7 +29,7 @@ test-ubuntu:
   before_script:
     - sh scripts/generate_resources.sh
   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:
   stage: test
@@ -37,7 +37,7 @@ test-fedora:
   before_script:
     - sh scripts/generate_resources.sh
   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:
   stage: test
@@ -45,7 +45,7 @@ test-arch:
   before_script:
     - sh scripts/generate_resources.sh
   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:
   stage: test

tests/functional/openlp_plugins/presentations/test_pdfcontroller.py

@@ -25,7 +25,7 @@ import os
 from pathlib import Path
 from shutil import rmtree, which
 from tempfile import mkdtemp
-from unittest import TestCase
+from unittest import TestCase, skipIf
 from unittest.mock import MagicMock, patch
 
 from PyQt5 import QtCore, QtGui
@@ -49,6 +49,7 @@ SCREEN = {
     'number': 1,
     'size': QtCore.QRect(0, 0, 1024, 768)
 }
+IS_CI = 'GITLAB_CI' in os.environ or 'APPVEYOR' in os.environ
 
 
 def get_screen_resolution():
@@ -114,6 +115,7 @@ class TestPdfController(TestCase, TestMixin):
         # THEN: 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):
         """
         Test loading a Pdf using the PdfController

tests/interfaces/openlp_plugins/bibles/test_lib_http.py

@@ -28,8 +28,10 @@ from unittest.mock import MagicMock
 from openlp.core.common.registry import Registry
 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):
 
     def setUp(self):