Merge pull request #59948 from qgis/backport-59910-to-release-3_40

[Backport release-3_40] Disable broken test for automatic transaction groups on GDAL >= 3.5
qgis · Dec 18, 2024 · 0b9bc7f · 0b9bc7f
2 parents 17d169c + 28c88ca
commit 0b9bc7f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/.ci/test_blocklist_qt6.txt b/.ci/test_blocklist_qt6.txt
@@ -53,7 +53,6 @@ PyQgsRasterLayerRenderer
 PyQgsShapefileProvider
 PyQgsSpatialiteProvider
 PyQgsSymbolLayerReadSld
-PyQgsVectorLayerEditBuffer
 PyQgsLayerDefinition
 PyQgsSettings
 PyQgsSettingsEntry

diff --git a/tests/src/python/test_qgsvectorlayereditbuffer.py b/tests/src/python/test_qgsvectorlayereditbuffer.py
@@ -11,6 +11,7 @@
 __copyright__ = "Copyright 2016, The QGIS Project"
 
 import os
+from osgeo import gdal
 
 from qgis.PyQt.QtCore import QTemporaryDir, QVariant
 from qgis.PyQt.QtTest import QSignalSpy
@@ -31,6 +32,10 @@
 start_app()
 
 
+def GDAL_COMPUTE_VERSION(maj, min, rev):
+    return (maj) * 1000000 + (min) * 10000 + (rev) * 100
+
+
 def createEmptyLayer():
     layer = QgsVectorLayer(
         "Point?field=fldtxt:string&field=fldint:integer", "addfeat", "memory"
@@ -843,7 +848,12 @@ def _check_feature(wkt):
                 self.assertEqual(f.attribute(2), None)
 
         _test(Qgis.TransactionMode.Disabled)
-        _test(Qgis.TransactionMode.AutomaticGroups)
+
+        # THIS FUNCTIONALITY IS BROKEN ON NEWER GDAL VERSIONS, DUE TO INCORRECT
+        # assumptions at time of development. See https://github.com/qgis/QGIS/pull/59797#issuecomment-2544133498
+        if int(gdal.VersionInfo("VERSION_NUM")) < GDAL_COMPUTE_VERSION(3, 5, 0):
+            _test(Qgis.TransactionMode.AutomaticGroups)
+
         _test(Qgis.TransactionMode.BufferedGroups)