From 40b7f136a522aedbf9c959a4370ab9fca75aab93 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Mon, 20 May 2024 01:43:35 +0200 Subject: [PATCH] test_provider_ogr_gpkg.py: make test robust to GDAL exceptions turned on --- tests/src/python/test_provider_ogr_gpkg.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/src/python/test_provider_ogr_gpkg.py b/tests/src/python/test_provider_ogr_gpkg.py index a6f69cb4934a..390119b6486d 100644 --- 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' " + \