Fix tests

Author: dmarteau

.docker/docker-compose.yml

@@ -1,7 +1,7 @@
 services:
   qgis:
-    user: ${UID}:${GID}
     image: ${QGIS_IMAGE_TAG}
+    user: ${UID}:${GID}
     network_mode: host
     container_name: qgis-lizmap-tests
     environment:

.docker/run-tests.sh

@@ -13,6 +13,8 @@ python3 -m venv $VENV --system-site-package
 echo "Installing requirements..."
 $VENV/bin/pip install -q --no-cache -r requirements/tests.txt
 
+export PYTHONPATH="/usr/share/qgis/python/:$PYTHONPATH"
+
 cd tests && $VENV/bin/python -m pytest -v
 
 

.github/workflows/tests.yml

@@ -16,13 +16,13 @@ jobs:
           python-version: "3.12"
           architecture: x64
           cache: "pip"
-          cache-dependency-path: "requirements/dev.txt"
+          cache-dependency-path: "requirements/lint.txt"
 
       - name: Install Python requirements
         run: pip install --quiet -r requirements/lint.txt
 
       - name: Run linter
-        run: ruff check --preview --output-format=concise lizmap
+        run: ruff check --output-format=concise lizmap
 
       - name: Run security check
         run: bandit -r lizmap -ll
@@ -39,6 +39,7 @@ jobs:
             "3.34",
             "3.40",
             "3.44",
+            "4.0",
         ]
     steps:
 

.gitlab-ci.yml

@@ -3,16 +3,58 @@ variables:
 
 stages:
 - lint
+- test
 - build
 - deploy
 
+# ------------
+# Lint
+# ------------
+
 lint:
-  image: $REGISTRY_URI/factory-ci-runner:qgis-ltr
-  stage: lint
+  image: ${REGISTRY_URL}/factory-ci-runner:qgis-${QGIS_FLAVOR}
   tags:
     - factory-plain
+  stage: lint
   script:
+    # No need since we do not type checking atm
+    #- pip install --quiet -r requirements/dev.txt
     - make lint
+  parallel:
+    matrix:
+      - QGIS_FLAVOR: [ "ltr", "release" ]
+
+# ------------
+# Tests
+# ------------
+
+.tests:
+  image: ${REGISTRY_URL}/factory-ci-runner:factory-ci
+  tags:
+    - factory-dind
+  stage: test
+  script:
+    - make docker-test QGIS_VERSION=$QGIS_FLAVOR
+
+qgis-tests:
+  extends: .tests
+  parallel:
+    matrix:
+      - QGIS_FLAVOR: [
+        "3.34",
+        "3.40",
+        "3.44",
+        "4.0",
+      ]
+
+
+# NOTE: Following jobs are triggered only on RELEASE_BRANCH == "true"
+
+# 
+# Packages 
+#
+
+>>>>>>> 6c46c59 (Fix tests)
 
 build:
   image: $REGISTRY_URI/factory-ci-runner:qgis-plugin-ci

Makefile

@@ -86,7 +86,7 @@ test:
 ifdef REGISTRY_URL
 REGISTRY_PREFIX=$(REGISTRY_URL)/
 else
-REGISTRY_PREFIX=3liz
+REGISTRY_PREFIX=3liz/
 endif
 
 QGIS_VERSION ?= 3.44
@@ -100,7 +100,7 @@ export GID=$(shell id -g)
 
 docker-test:
 	set -e; \
-	cd .docker; 
+	cd .docker; \
 	docker compose up \
 		--quiet-pull \
 		--abort-on-container-exit \

lizmap/dialogs/server_wizard.py

@@ -8,6 +8,7 @@
 from typing import TYPE_CHECKING
 
 from qgis.core import (
+    Qgis,
     QgsAbstractDatabaseProviderConnection,
     QgsApplication,
     QgsAuthMethodConfig,
@@ -874,6 +875,11 @@ def __init__(
         self.setPage(WizardPages.CreateNewFolderDav, CreateNewFolderDavPage())
         self.setPage(WizardPages.LizmapNewRepository, LizmapNewRepositoryPage())
 
+    # TODO: If these methods raises an exception while called
+    # by the Qt framework this cause a "Fatal Python error"
+    # These method should be bounded by try/except when used from
+    # Qt framework.
+
     @logger.log_function
     def validateCurrentPage(self):
         """Specific rules for page validation. """
@@ -1090,7 +1096,12 @@ def request_check_url(self, url: str, login: str, password: str) -> tuple[bool,
         net_req.setUrl(QUrl(url))
         token = b64encode(f"{login}:{password}".encode())
         net_req.setRawHeader(b"Authorization", b"Basic %s" % token)
-        net_req.setAttribute(QNetworkRequest.FollowRedirectsAttribute, True)
+        # NOTE: According to QT6 doc this is enabled by default
+        # See https://doc.qt.io/archives/qt-5.15/qnetworkrequest.html#RedirectPolicy-enum
+        # See https://doc.qt.io/qt-6/network-changes-qt6.html#redirect-policies
+        if Qgis.versionInt() < 40000:
+            net_req.setAttribute(QNetworkRequest.FollowRedirectsAttribute, True)
+
         request = QgsBlockingNetworkRequest()
         error = request.get(net_req)
         if error == QgsBlockingNetworkRequest.ErrorCode.NetworkError:

lizmap/plugin/config.py

@@ -322,7 +322,7 @@ def save_cfg_file(
                 self.project.layerTreeRoot(),
                 GroupNames.BaseLayers,
             )
-            if qgis_group and self.lwc_version >= LwcVersions.Lizmap_3_7:
+            if qgis_group is not None and self.lwc_version >= LwcVersions.Lizmap_3_7:
                 self.disable_legacy_empty_base_layer()
 
         if self.version_checker:

lizmap/plugin/core.py

@@ -107,6 +107,7 @@
     QGIS_PLUGIN_MANAGER = False
 
 
+from .. import logger
 from ..qt_style_sheets import NEW_FEATURE_CSS
 from ..server_lwc import MAX_DAYS, ServerManager
 from ..toolbelt.convert import ambiguous_to_bool
@@ -127,9 +128,7 @@
 )
 from ..tooltip import Tooltip
 from ..version_checker import VersionChecker
-
-from .. import logger
-
+from . import helpers
 from .baselayers import BaseLayersManager
 from .config import ConfigFileManager
 from .dataviz import DatavizManager

lizmap/plugin/layer_tree.py

@@ -1,6 +1,4 @@
 """Layer tree panel configuration"""
-from __future__ import annotations
-
 import contextlib
 import hashlib
 import json
@@ -10,6 +8,7 @@
     TYPE_CHECKING,
     Any,
     Protocol,
+    Tuple,
 )
 
 from qgis.core import (
@@ -883,7 +882,7 @@ def _add_group_legend(
             root_group = project.layerTreeRoot()
 
         qgis_group = self.existing_group(root_group, label)
-        if qgis_group:
+        if qgis_group is not None:
             return qgis_group
 
         new_group = root_group.addGroup(label)
@@ -892,16 +891,16 @@ def _add_group_legend(
         return new_group
 
     @staticmethod
-    def existing_group(
-        root_group: QgsLayerTree,
+    def _existing_group(
+        root_group: Optional[QgsLayerTree],
         label: str,
         index: bool = False,
-    ) -> QgsLayerTreeGroup | int | None:
+    ) -> Optional[Tuple[QgsLayerTreeGroup, int]]:
         """Return the existing group in the legend if existing.
 
         It will either return the group itself if found, or its index.
         """
-        if not root_group:
+        if root_group is None:
             return None
 
         # Iterate over all child (layers and groups)
@@ -912,19 +911,34 @@ def existing_group(
                 i += 1
                 continue
 
-            qgis_group = cast_to_group(child)
-            qgis_group: QgsLayerTreeGroup
+            qgis_group: QgsLayerTreeGroup = cast_to_group(child)
             count_children = len(qgis_group.children())
             if count_children >= 1 or qgis_group.name() == label:
                 # We do not want to count empty groups
                 # Except for the one we are looking for
                 i += 1
 
             if qgis_group.name() == label:
-                return i if index else qgis_group
+                return (qgis_group, i)
 
         return None
 
+    @staticmethod
+    def existing_group(
+        root_group: Optional[QgsLayerTree],
+        label: str,
+    ) -> Optional[QgsLayerTreeGroup]:
+        g = LayerTreeManager._existing_group(root_group, label)
+        return g[0] if g is not None else None
+
+    @staticmethod
+    def existing_group_index(
+        root_group: Optional[QgsLayerTree],
+        label: str,
+    ) -> Optional[QgsLayerTreeGroup]:
+        g = LayerTreeManager._existing_group(root_group, label)
+        return g[1] if g is not None else None
+
     def _add_base_layer(
         self,
         source: str,

lizmap/plugin/project.py

@@ -536,14 +536,13 @@ def project_config_file(
             GroupNames.BaseLayers,
         )
 
-        if base_layers_group:
+        if base_layers_group is not None:
             base_layers_group: QgsLayerTreeGroup
             base_layers_group.setIsMutuallyExclusive(True, -1)
 
-            default_background_color_index = LayerTreeManager.existing_group(
+            default_background_color_index = LayerTreeManager.existing_group_index(
                 base_layers_group,
                 GroupNames.BackgroundColor,
-                index=True,
             )
 
             if default_background_color_index is not None and default_background_color_index >= 0: