Adapt test to GDAL 3.4

qgis · Sep 30, 2021 · 279a892 · 279a892
1 parent 0c4d0ea
commit 279a892
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/tests/src/python/test_provider_ogr.py b/tests/src/python/test_provider_ogr.py
@@ -2304,7 +2304,12 @@ def testGeoJsonFieldOrder(self):
         self.assertEqual(features[1].attribute('C'), 'C')
 
         self.assertTrue(vl.commitChanges())
-        self.assertEqual(vl.fields().names(), ['A', 'C', 'B'])
+
+        # This has been fixed in GDAL >= 3.4
+        if int(gdal.VersionInfo('VERSION_NUM')) >= GDAL_COMPUTE_VERSION(3, 4, 0):
+            self.assertEqual(vl.fields().names(), ['A', 'B', 'C'])
+        else:
+            self.assertEqual(vl.fields().names(), ['A', 'C', 'B'])
 
         features = [f for f in vl.getFeatures()]
 

diff --git a/tests/testdata/curved_polys.gpkg b/tests/testdata/curved_polys.gpkg
diff --git a/tests/testdata/domains.gpkg b/tests/testdata/domains.gpkg
diff --git a/tests/testdata/mixed_layers.gpkg b/tests/testdata/mixed_layers.gpkg