From df7036ac1fd8ceec812f9031f091954b2ba7212f Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <ph.wolfer@gmail.com>
Date: Sun, 21 Apr 2024 17:56:22 +0200
Subject: [PATCH] Run tests with pytest before Windows and macOS builds

This gives better and more detailed test output
---
 .github/workflows/package-macos.yml   | 3 +--
 .github/workflows/package-windows.yml | 2 +-
 requirements-build.txt                | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/package-macos.yml b/.github/workflows/package-macos.yml
index 2f3b640ff1..a1e610c919 100644
--- a/.github/workflows/package-macos.yml
+++ b/.github/workflows/package-macos.yml
@@ -50,8 +50,7 @@ jobs:
         PYINSTALLER_COMPILE_BOOTLOADER: "1"
     - name: Run tests
       timeout-minutes: 30
-      run: |
-        python3 setup.py test
+      run: pytest --verbose
     - name: Prepare code signing certificate
       run: |
         if [ -n "$CODESIGN_MACOS_P12_URL" ] && [ -n "$AWS_ACCESS_KEY_ID" ]; then
diff --git a/.github/workflows/package-windows.yml b/.github/workflows/package-windows.yml
index b8863c834e..de841fb37d 100644
--- a/.github/workflows/package-windows.yml
+++ b/.github/workflows/package-windows.yml
@@ -60,7 +60,7 @@ jobs:
         python setup.py patch_version --platform=$Env:BUILD_NUMBER.$(git rev-parse --short HEAD)
     - name: Run tests
       timeout-minutes: 30
-      run: python setup.py test
+      run: pytest --verbose
     - name: Prepare code signing certificate
       if: matrix.type != 'store-app'
       run: |
diff --git a/requirements-build.txt b/requirements-build.txt
index fe2ec5b61b..153bb8646b 100644
--- a/requirements-build.txt
+++ b/requirements-build.txt
@@ -1,3 +1,4 @@
 Babel>=2.10.0
 PyInstaller==6.5.0
+pytest>=8.1
 setuptools>=62.4.0