Fix github action to PySide6 apps test

Author: mstuttgart

.github/workflows/coverage.yml

@@ -24,7 +24,7 @@ jobs:
         run: sudo apt update -y
 
       - name: 'Install Dependencies'
-        run: sudo apt install -y patchelf libopengl0 libegl-dev
+        run: sudo apt install -y patchelf libopengl0 libegl-dev libgles2-mesa-dev nuitka
 
       - name: Install coverage dependencies
         run: |

.github/workflows/lint.yml

@@ -24,7 +24,7 @@ jobs:
         run: sudo apt update -y
 
       - name: 'Install Dependencies'
-        run: sudo apt install -y patchelf libopengl0 libegl-dev
+        run: sudo apt install -y patchelf libopengl0 libegl-dev libgles2-mesa-dev nuitka
 
       - name: Install test dependencies for linting
         run: |

.github/workflows/test.yml

@@ -4,33 +4,86 @@
 name: Github CI PyTest
 
 on:
-  pull_request:
-    branches:
-      - "*"
   push:
     branches:
-      - "*"
+      - main
+      - develop
+
+  pull_request:
+
+# Cancel running jobs for the same workflow and branch.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
-  build:
-    name: Build
+  package:
     runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build and Check Package
+        uses: hynek/build-and-inspect-python-package@v2.12
+
+  test:
+
+    needs: [package]
+
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+
+      matrix:
+        python-version: ["3.12"]
+        qt-lib: [pyside6]
+        os: [ubuntu-latest, windows-latest, macos-latest]
+
+# on:
+#   pull_request:
+#     branches:
+#       - "*"
+#   push:
+#     branches:
+#       - "*"
+
+# jobs:
+  # build:
+  #   name: Build
+  #   runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      # - uses: actions/checkout@v4
+      # - uses: actions/setup-python@v4
+      #   with:
+      #     python-version: "3.12"
+
+      - uses: actions/checkout@v4
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5.5.0
         with:
-          python-version: "3.12"
+          python-version: ${{ matrix.python-version }}
 
-      - name: 'Update Packages'
-        run: sudo apt update -y
+      - name: Install Dependencies
+        run: |
+          if [ "${{ matrix.os }}" == "ubuntu-latest" ]; then
+            sudo apt-get update -y
+            sudo apt-get install -y libgles2-mesa-dev
+          fi
+        shell: bash
+
+      # - name: 'Update Packages'
+      #   run: sudo apt update -y
 
-      - name: 'Install Dependencies'
-        run: sudo apt install -y patchelf libopengl0 libegl-dev
+      # - name: 'Install Dependencies'
+      #   run: sudo apt install -y patchelf libopengl0 libegl-dev libgles2-mesa-dev nuitka
 
       - name: Install test dependencies
         run: |
           pip install ".[dev]"
 
+      - name: 'Run PySide6 Tests'
+        run: |
+          python -c "from PySide6.QtWidgets import QApplication; app = QApplication([]); print('PySide6 is working!')"
+
       - name: Run tests
         run: make test

pyproject.toml

@@ -137,7 +137,7 @@ strict_optional = false
 
 [tool.coverage.run]
 branch = true
-omit = ["tests/*", "src/app_rc.py", "src/__init__.py", "src/main.py", "src/__version__.py"]
+omit = ["tests/*", "src/app_rc.py", "src/__init__.py", "src/app.py", "src/__version__.py"]
 
 [tool.pyside6-project]
-files = ["main.py"]
+files = ["app.py"]

tests/test_comic.py

@@ -80,21 +80,23 @@ def test_get_comic_path(comic_data):
     expected_path = os.path.join(directory, filename)
     assert comic.getComicPath() == expected_path
 
-    def test_comic_initialization(comic_data):
-        """
-        Test the initialization of the Comic class.
-        """
-        comic, filename, directory, _ = comic_data
-        assert comic.getFilename() == filename
-        assert comic.getDirectory() == directory
-        assert comic.getPages() == []
-
-    def test_set_and_get_pages(comic_data):
-        """
-        Test setting and getting pages.
-        """
-        comic, _, _, pages = comic_data
-        comic.setPages(pages)
-        assert comic.getPages() == pages
-        assert len(comic.getPages()) == len(pages)
-        assert all(isinstance(page, Page) for page in comic.getPages())
+
+def test_comic_initialization(comic_data):
+    """
+    Test the initialization of the Comic class.
+    """
+    comic, filename, directory, _ = comic_data
+    assert comic.getFilename() == filename
+    assert comic.getDirectory() == directory
+    assert comic.getPages() == []
+
+
+def test_set_and_get_pages(comic_data):
+    """
+    Test setting and getting pages.
+    """
+    comic, _, _, pages = comic_data
+    comic.setPages(pages)
+    assert comic.getPages() == pages
+    assert len(comic.getPages()) == len(pages)
+    assert all(isinstance(page, Page) for page in comic.getPages())

tests/test_comic_page_handler.py

@@ -1,21 +1,12 @@
-from unittest.mock import patch
-
 import pytest
 
 from src.models.comic import Comic
 from src.models.comic_handler import ComicHandler
 from src.models.page import Page
 
 
-# Mock the QPixmap class to avoid loading actual images
-# and to prevent the need for a GUI environment.
-class MagicMockQPixmap:
-    def loadFromData(self, data):
-        return MagicMockQPixmap()
-
-
 @pytest.fixture
-def comic_handler():
+def comic_handler(qtbot):
     """
     Fixture to set up a ComicHandler instance with a mock Comic object.
     """
@@ -26,8 +17,7 @@ def comic_handler():
 
     comic.setPages([page_1, page_2, page_3])
 
-    with patch("src.models.comic_handler.QPixmap", return_value=MagicMockQPixmap):
-        handler = ComicHandler(comic)
+    handler = ComicHandler(comic)
 
     return handler, comic, [page_1, page_2, page_3]
 

tests/test_comic_page_handler_single_page.py

@@ -1,5 +1,3 @@
-from unittest.mock import MagicMock, patch
-
 import pytest
 from PySide6.QtGui import QPixmap
 
@@ -8,19 +6,8 @@
 from src.models.page import Page
 
 
-# Mock the QPixmap class to avoid loading actual images
-# and to prevent the need for a GUI environment.
-class MagicMockQPixmap(QPixmap):
-    def __init__(self, *args, **kwargs):
-        pass
-
-    @staticmethod
-    def loadFromData(*args, **kwargs):
-        return MagicMock()
-
-
 @pytest.fixture
-def comic_handler():
+def comic_handler(qtbot):
     """
     Fixture to set up a ComicHandlerSinglePage object with a mock comic and pages.
     """
@@ -31,8 +18,7 @@ def comic_handler():
 
     comic.setPages([page_1, page_2, page_3])
 
-    with patch("src.models.comic_handler.QPixmap", return_value=MagicMockQPixmap()):
-        obj = ComicHandlerSinglePage(comic)
+    obj = ComicHandlerSinglePage(comic)
 
     return obj
 
@@ -72,4 +58,4 @@ def test_get_current_page_image(comic_handler):
     Test that the getCurrentPageImage method returns a QPixmap object.
     """
     pixmap = comic_handler.getCurrentPageImage()
-    assert isinstance(pixmap, MagicMockQPixmap)  # Check if it returns a mocked QPixmap
+    assert isinstance(pixmap, QPixmap)  # Check if it returns a mocked QPixmap