test_provider_ogr_gpkg.py: make test robust to GDAL exceptions turned on

qgis · May 20, 2024 · b049d23 · b049d23
1 parent b7bfdda
commit b049d23
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/tests/src/python/test_provider_ogr_gpkg.py b/tests/src/python/test_provider_ogr_gpkg.py
@@ -2323,7 +2323,8 @@ def _testVectorLayerExporterDeferredSpatialIndex(self, layerOptions, expectSpati
 
         tmpfile = os.path.join(
             self.basetestpath, 'testVectorLayerExporterDeferredSpatialIndex.gpkg')
-        gdal.Unlink(tmpfile)
+        if os.path.exists(tmpfile):
+            os.unlink(tmpfile)
         options = {}
         options['driverName'] = 'GPKG'
         options['layerName'] = 'table1'
@@ -2442,7 +2443,10 @@ def testFixWrongMetadataReferenceColumnNameUpdate(self):
 
         ds = ogr.Open(tmpfile, update=1)
         gdal.PushErrorHandler()
-        ds.ExecuteSQL('DROP TRIGGER gpkg_metadata_reference_column_name_update')
+        try:
+            ds.ExecuteSQL('DROP TRIGGER gpkg_metadata_reference_column_name_update')
+        except Exception:
+            pass
         gdal.PopErrorHandler()
         # inject wrong trigger on purpose
         wrong_trigger = "CREATE TRIGGER 'gpkg_metadata_reference_column_name_update' " + \