add integration tests (#158)

* add integration tests

* fix uninstall button not disabled + fix test setup

* fix dnl libs

* reuse wheel workflow

* install deps

* fix install

* python path

* fix other test

* tests cleanup

* fix test

Author: 3nids

.github/workflows/integration-tests.yml

@@ -0,0 +1,92 @@
+name: 🧪 Integration tests
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  build-wheel:
+    name: Build Python wheel
+    uses: ./.github/workflows/python-wheel-package.yml
+
+  integration-tests:
+    name: Integration tests
+    runs-on: ubuntu-latest
+    needs: build-wheel
+
+    services:
+      postgres:
+        image: postgis/postgis:17-3.5
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: postgres
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd "pg_isready -U postgres"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+    env:
+      PGUSER: postgres
+      PGPASSWORD: postgres
+      PGHOST: localhost
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Install system dependencies for PyQt6
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y \
+            libegl1 \
+            libxkbcommon-x11-0 \
+            libxcb-icccm4 \
+            libxcb-image0 \
+            libxcb-keysyms1 \
+            libxcb-randr0 \
+            libxcb-render-util0 \
+            libxcb-xinerama0 \
+            libxcb-xfixes0 \
+            libxcb-shape0
+
+      - name: Download wheel artifact
+        uses: actions/download-artifact@v6
+        with:
+          name: oqtopus-wheel
+          path: dist/
+
+      - name: Install dependencies
+        run: |
+          pip install --upgrade pip
+          pip install -r requirements.txt
+          pip install -r requirements-standalone.txt
+          pip install pytest
+          # Extract bundled libs from the wheel into the local source tree
+          # (the local oqtopus/ shadows the installed package, so libs must be present locally)
+          unzip -o dist/*.whl "oqtopus/libs/*" -d .
+
+      - name: Setup test database
+        run: bash scripts/setup_test_db.sh
+
+      - name: Run integration tests
+        env:
+          QT_QPA_PLATFORM: offscreen
+          PYTHONPATH: oqtopus/libs
+        run: >-
+          pytest
+          tests/
+          --ignore=tests/test_plugin_load.py
+          -v

.github/workflows/plugin-test.yml

@@ -68,4 +68,4 @@ jobs:
           -e PYTHONPATH=/usr/share/qgis/python/plugins:/usr/share/qgis/python
           -v $(pwd):/usr/src
           -w /usr/src qgis/qgis:${QGIS_TEST_VERSION}
-          sh -c 'pip3 install -r requirements.txt || pip3 install -r requirements.txt --break-system-packages;xvfb-run pytest'
+          sh -c 'pip3 install -r requirements.txt || pip3 install -r requirements.txt --break-system-packages;xvfb-run pytest --ignore=tests/test_module_widget.py'

oqtopus/__init__.py

@@ -1,3 +1,40 @@
+import sys
+import types
+
+# Create fake qgis.PyQt modules that point to PyQt5/6 modules
+# This allows oqtopus to run standalone without QGIS installed
+if "qgis" not in sys.modules:
+    try:
+        pyqt_core = __import__("PyQt6.QtCore", fromlist=[""])
+        pyqt_gui = __import__("PyQt6.QtGui", fromlist=[""])
+        pyqt_network = __import__("PyQt6.QtNetwork", fromlist=[""])
+        pyqt_widgets = __import__("PyQt6.QtWidgets", fromlist=[""])
+        pyqt_uic = __import__("PyQt6.uic", fromlist=[""])
+    except ModuleNotFoundError:
+        pyqt_core = __import__("PyQt5.QtCore", fromlist=[""])
+        pyqt_gui = __import__("PyQt5.QtGui", fromlist=[""])
+        pyqt_network = __import__("PyQt5.QtNetwork", fromlist=[""])
+        pyqt_widgets = __import__("PyQt5.QtWidgets", fromlist=[""])
+        pyqt_uic = __import__("PyQt5.uic", fromlist=[""])
+
+    qgis = types.ModuleType("qgis")
+    pyqt = types.ModuleType("qgis.PyQt")
+    pyqt.QtCore = pyqt_core
+    pyqt.QtGui = pyqt_gui
+    pyqt.QtNetwork = pyqt_network
+    pyqt.QtWidgets = pyqt_widgets
+    pyqt.uic = pyqt_uic
+
+    qgis.PyQt = pyqt
+    sys.modules["qgis"] = qgis
+    sys.modules["qgis.PyQt"] = pyqt
+    sys.modules["qgis.PyQt.QtCore"] = pyqt_core
+    sys.modules["qgis.PyQt.QtGui"] = pyqt_gui
+    sys.modules["qgis.PyQt.QtNetwork"] = pyqt_network
+    sys.modules["qgis.PyQt.QtWidgets"] = pyqt_widgets
+    sys.modules["qgis.PyQt.uic"] = pyqt_uic
+
+
 def classFactory(iface):
     from .oqtopus_plugin import OqtopusPlugin
 

oqtopus/core/module_package.py

@@ -13,6 +13,7 @@ class Type:
         BRANCH = "branch"
         PULL_REQUEST = "pull_request"
         FROM_ZIP = "from_zip"
+        FROM_DIRECTORY = "from_directory"
 
     def __init__(
         self,
@@ -50,6 +51,8 @@ def __init__(
             self.__parse_pull_request(json_payload)
         elif self.type == ModulePackage.Type.FROM_ZIP:
             return
+        elif self.type == ModulePackage.Type.FROM_DIRECTORY:
+            return
         else:
             raise ValueError(f"Unknown type '{type}'")
 

oqtopus/core/package_prepare_task.py

@@ -50,6 +50,7 @@ def __init__(self, parent=None):
 
         self.module_package = None
         self.from_zip_file = None
+        self.from_directory = None
 
         self.__destination_directory = None
 
@@ -64,13 +65,23 @@ def __init__(self, parent=None):
     def startFromZip(self, module_package, zip_file: str):
         self.module_package = module_package
         self.from_zip_file = zip_file
+        self.from_directory = None
+
+        self.__canceled = False
+        self.start()
+
+    def startFromDirectory(self, module_package, directory: str):
+        self.module_package = module_package
+        self.from_zip_file = None
+        self.from_directory = directory
 
         self.__canceled = False
         self.start()
 
     def startFromModulePackage(self, module_package):
         self.module_package = module_package
         self.from_zip_file = None
+        self.from_directory = None
 
         self.__canceled = False
         self.start()
@@ -87,6 +98,16 @@ def run(self):
             if self.module_package is None:
                 raise Exception(self.tr("No module version provided."))
 
+            # For directory loading, just point source_package_dir directly
+            if self.from_directory:
+                if not os.path.isdir(self.from_directory):
+                    raise Exception(
+                        self.tr(f"The directory '{self.from_directory}' does not exist.")
+                    )
+                self.module_package.source_package_dir = self.from_directory
+                self.lastError = None
+                return
+
             self.__destination_directory = self.__prepare_destination_directory()
             logger.info(f"Destination directory: {self.__destination_directory}")
 

oqtopus/gui/module_selection_widget.py

@@ -52,11 +52,13 @@ def __init__(self, modules_config_path, parent=None):
         self.module_seeChangeLog_pushButton.setEnabled(False)
 
         self.module_zipPackage_groupBox.setVisible(False)
+        self.module_directoryPackage_groupBox.setVisible(False)
 
         self.module_module_comboBox.currentIndexChanged.connect(self.__moduleChanged)
         self.module_package_comboBox.currentIndexChanged.connect(self.__moduleVersionChanged)
         self.module_seeChangeLog_pushButton.clicked.connect(self.__seeChangeLogClicked)
         self.module_browseZip_toolButton.clicked.connect(self.__moduleBrowseZipClicked)
+        self.module_browseDirectory_toolButton.clicked.connect(self.__moduleBrowseDirectoryClicked)
 
         self.__packagePrepareTask = PackagePrepareTask(self)
         self.__packagePrepareTask.finished.connect(self.__packagePrepareTaskFinished)
@@ -213,9 +215,17 @@ def __moduleVersionChanged(self, index):
 
         if self.__current_module_package.type == self.__current_module_package.Type.FROM_ZIP:
             self.module_zipPackage_groupBox.setVisible(True)
+            self.module_directoryPackage_groupBox.setVisible(False)
+            return
+        elif (
+            self.__current_module_package.type == self.__current_module_package.Type.FROM_DIRECTORY
+        ):
+            self.module_zipPackage_groupBox.setVisible(False)
+            self.module_directoryPackage_groupBox.setVisible(True)
             return
         else:
             self.module_zipPackage_groupBox.setVisible(False)
+            self.module_directoryPackage_groupBox.setVisible(False)
 
         loading_text = self.tr("Loading package...")
         self.module_information_label.setText(loading_text)
@@ -278,6 +288,35 @@ def __loadModuleFromZip(self, filename):
         self.signal_loadingStarted.emit()
         self.module_progressBar.setMaximum(100)
         self.module_progressBar.setValue(0)
+
+    def __moduleBrowseDirectoryClicked(self):
+        directory = QFileDialog.getExistingDirectory(self, self.tr("Open from directory"), None)
+
+        if directory == "":
+            return
+
+        self.module_fromDirectory_lineEdit.setText(directory)
+
+        try:
+            with OverrideCursor(Qt.CursorShape.WaitCursor):
+                self.__loadModuleFromDirectory(directory)
+        except Exception as exception:
+            CriticalMessageBox(
+                self.tr("Error"), self.tr("Can't load module from directory:"), exception, self
+            ).exec()
+            return
+
+    def __loadModuleFromDirectory(self, directory):
+
+        if self.__packagePrepareTask.isRunning():
+            self.__packagePrepareTask.cancel()
+            self.__packagePrepareTask.wait()
+
+        self.__packagePrepareTask.startFromDirectory(self.__current_module_package, directory)
+
+        self.signal_loadingStarted.emit()
+        self.module_progressBar.setMaximum(0)
+        self.module_progressBar.setValue(0)
         self.module_progressBar.setVisible(True)
 
     def __packagePrepareTaskFinished(self):
@@ -361,11 +400,14 @@ def __seeChangeLogClicked(self):
             )
             return
 
-        if self.__current_module_package.type == ModulePackage.Type.FROM_ZIP:
+        if self.__current_module_package.type in (
+            ModulePackage.Type.FROM_ZIP,
+            ModulePackage.Type.FROM_DIRECTORY,
+        ):
             QMessageBox.warning(
                 self,
                 self.tr("Can't open changelog"),
-                self.tr("Changelog is not available for Zip packages."),
+                self.tr("Changelog is not available for local packages."),
             )
             return
 
@@ -438,6 +480,17 @@ def __loadVersionsFinished(self, error):
                 name="from_zip",
             ),
         )
+        self.module_package_comboBox.addItem(
+            self.tr("Load from directory"),
+            ModulePackage(
+                module=self.__current_module,
+                organisation=self.__current_module.organisation,
+                repository=self.__current_module.repository,
+                json_payload=None,
+                type=ModulePackage.Type.FROM_DIRECTORY,
+                name="from_directory",
+            ),
+        )
 
         self.module_package_comboBox.insertSeparator(self.module_package_comboBox.count())
 
@@ -462,8 +515,9 @@ def __loadDevelopmentVersionsFinished(self, error):
         QApplication.restoreOverrideCursor()
         self.module_progressBar.setVisible(False)
 
-        # Hide zip widget when loading development versions
+        # Hide zip/directory widgets when loading development versions
         self.module_zipPackage_groupBox.setVisible(False)
+        self.module_directoryPackage_groupBox.setVisible(False)
 
         # Clear current module package - user needs to select a specific version
         self.__current_module_package = None

oqtopus/gui/module_widget.py

@@ -897,7 +897,6 @@ def __updateModuleInfo(self):
         sm = SchemaMigrations(self.__pum_config)
 
         self.moduleInfo_stackedWidget.setEnabled(True)
-        self.__configure_uninstall_button()
 
         # Wrap read-only queries in transaction to prevent idle connections
         with self.__database_connection.transaction():
@@ -954,6 +953,9 @@ def __updateModuleInfo(self):
                 # Module not installed - show install page
                 self.__show_install_page(target_version)
 
+        # Configure uninstall button after determining which page to show
+        self.__configure_uninstall_button()
+
     def __startOperation(self, operation: str, parameters: dict, options: dict):
         """Start a background module operation."""
         # Disable UI during operation

oqtopus/oqtopus.py

@@ -1,47 +1,16 @@
 import sys
-import types
 from pathlib import Path
 
-# Create fake qgis.PyQt modules that point to PyQt5 modules
-try:
-    pyqt_core = __import__("PyQt6.QtCore", fromlist=[""])
-    pyqt_gui = __import__("PyQt6.QtGui", fromlist=[""])
-    pyqt_network = __import__("PyQt6.QtNetwork", fromlist=[""])
-    pyqt_widgets = __import__("PyQt6.QtWidgets", fromlist=[""])
-    pyqt_uic = __import__("PyQt6.uic", fromlist=[""])
-except ModuleNotFoundError:
-    pyqt_core = __import__("PyQt5.QtCore", fromlist=[""])
-    pyqt_gui = __import__("PyQt5.QtGui", fromlist=[""])
-    pyqt_network = __import__("PyQt5.QtNetwork", fromlist=[""])
-    pyqt_widgets = __import__("PyQt5.QtWidgets", fromlist=[""])
-    pyqt_uic = __import__("PyQt5.uic", fromlist=[""])
-
-# Create the qgis, qgis.PyQt, and submodules in sys.modules
-qgis = types.ModuleType("qgis")
-pyqt = types.ModuleType("qgis.PyQt")
-pyqt.QtCore = pyqt_core
-pyqt.QtGui = pyqt_gui
-pyqt.QtNetwork = pyqt_network
-pyqt.QtWidgets = pyqt_widgets
-pyqt.uic = pyqt_uic
-
-qgis.PyQt = pyqt
-sys.modules["qgis"] = qgis
-sys.modules["qgis.PyQt"] = pyqt
-sys.modules["qgis.PyQt.QtCore"] = pyqt_core
-sys.modules["qgis.PyQt.QtGui"] = pyqt_gui
-sys.modules["qgis.PyQt.QtNetwork"] = pyqt_network
-sys.modules["qgis.PyQt.QtWidgets"] = pyqt_widgets
-sys.modules["qgis.PyQt.uic"] = pyqt_uic
-
-from qgis.PyQt.QtGui import QIcon  # noqa: E402
-
-from .gui.main_dialog import MainDialog  # noqa: E402
-from .utils.plugin_utils import PluginUtils  # noqa: E402
+# The qgis.PyQt shim is set up in oqtopus/__init__.py
+from qgis.PyQt.QtGui import QIcon
+from qgis.PyQt.QtWidgets import QApplication
+
+from .gui.main_dialog import MainDialog
+from .utils.plugin_utils import PluginUtils
 
 
 def main():
-    app = pyqt_widgets.QApplication(sys.argv)
+    app = QApplication(sys.argv)
     icon = QIcon("oqtopus/icons/oqtopus-logo.png")
     app.setWindowIcon(icon)